From 1f600d049ba7c6858d4a7b9b3a364587804a1f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A?= <pop.atry@gmail.com>
Date: Fri, 10 Aug 2012 12:14:56 +0800
Subject: [PATCH 1/2] Check JAVA_HOME

---
 src/windows/sbt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/windows/sbt b/src/windows/sbt
index e2fbdb5e6..70cdcfbe3 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"`

From edecd0f1bdd12ad485150e7cb27725c746678120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A?= <pop.atry@gmail.com>
Date: Fri, 10 Aug 2012 12:15:45 +0800
Subject: [PATCH 2/2] Quote arguments and $JAVA_CMD

---
 src/windows/sbt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/windows/sbt b/src/windows/sbt
index 70cdcfbe3..d1a88bdc8 100644
--- a/src/windows/sbt
+++ b/src/windows/sbt
@@ -19,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