diff --git a/src/windows/sbt b/src/windows/sbt index e2fbdb5e6..d1a88bdc8 100644 --- a/src/windows/sbt +++ b/src/windows/sbt @@ -1,7 +1,12 @@ #!/bin/sh # sbt launcher script for Cygwin and MSYS +if [ -z "$JAVA_HOME" ]; then JAVA_CMD=java +else +JAVA_CMD=$JAVA_HOME/bin/java +fi + JAVA_OPTS=-Xmx512M UDIR=`dirname "$0"` @@ -14,9 +19,9 @@ fi if [ "_$TERM" = "_xterm" ]; then # Let the terminal handle ANSI sequences stty -icanon min 1 -echo > /dev/null 2>&1 - $JAVA_CMD $JAVA_OPTS -Djline.terminal=jline.UnixTerminal -jar "$WDIR/sbt-launch.jar" $@ + "$JAVA_CMD" $JAVA_OPTS -Djline.terminal=jline.UnixTerminal -jar "$WDIR/sbt-launch.jar" "$@" stty icanon echo > /dev/null 2>&1 else # Use Jansi to intercept ANSI sequences - $JAVA_CMD $JAVA_OPTS -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" SbtJansiLaunch $@ -fi + "$JAVA_CMD" $JAVA_OPTS -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" SbtJansiLaunch "$@" +fi \ No newline at end of file