Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export path inside of run.sh #226

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Export path inside of run.sh #226

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c5e12a
Export path inside of script
benedikt-schesch Oct 4, 2023
d368345
Bug fix
benedikt-schesch Oct 4, 2023
79a9b0c
Bug fix
benedikt-schesch Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,7 @@ while [ $# -gt 0 ]; do
shift
done

if ! command -v git-hires-merge &> /dev/null
then
echo "git-hires-merge is not on the PATH"
echo "Run: export PATH=$(pwd)/src/scripts/merge_tools/:\$PATH"
echo "Alternatively, you can run: echo 'export PATH=$(pwd)/src/scripts/merge_tools/:\$PATH' >> ~/.bashrc"
exit 1
fi
export PATH=$(pwd)/src/scripts/merge_tools/:$PATH

mvn -v | head -n 1 | cut -c 14-18 | grep -q 3.9. || { echo "Maven 3.9.* is required"; mvn -v; echo "PATH=$PATH"; exit 1; }
if [ -z "${JAVA8_HOME:+isset}" ] ; then echo "JAVA8_HOME is not set"; exit 1; fi
Expand Down