Skip to content

SPARK-964 Fix for -java-home note. #71

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

Closed
wants to merge 1 commit into from
Closed

SPARK-964 Fix for -java-home note. #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions sbt/sbt-launch-lib.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ declare -a java_args
declare -a scalac_args
declare -a sbt_commands

if test -x "$JAVA_HOME/bin/java"; then
echo -e "Using $JAVA_HOME as default JAVA_HOME."
echo "Note, this will be overridden by -java-home if it is set."
declare java_cmd="$JAVA_HOME/bin/java"
else
declare java_cmd=java
fi

echoerr () {
echo 1>&2 "$@"
}
Expand Down Expand Up @@ -165,6 +157,17 @@ run() {
process_args "$@"
set -- "${residual_args[@]}"
argumentCount=$#


if test -x "$JAVA_HOME/bin/java"; then
echo -e "Using $JAVA_HOME as JAVA_HOME."
declare java_cmd="$JAVA_HOME/bin/java"
elif test -z "$JAVA_HOME"; then
declare java_cmd=java
else
echo -e "JAVA_HOME:$JAVA_HOME points to invalid jdk installation."
exit 123
fi

# run sbt
execRunner "$java_cmd" \
Expand Down