From 3b9519b793751a583c88a4a796bca157cbf3a1a7 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 17 Jun 2013 12:56:18 -0400
Subject: [PATCH] Fixes to scripts for working in both cygwin and cmd.exe.

THis basically moves from jline.UnixTerminal to just unix.
---
 src/windows/sbt     | 7 +++++--
 src/windows/sbt.bat | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/windows/sbt b/src/windows/sbt
index 7037324cd..c96095635 100644
--- a/src/windows/sbt
+++ b/src/windows/sbt
@@ -24,12 +24,15 @@ if [ -z "$JAVA_OPTS" ]; then
   JAVA_OPTS=$(cat "$WDIR/sbtconfig.txt" | sed -e 's/\r//g' -e 's/^#.*$//g' | sed ':a;N;$!ba;s/\n/ /g')
 fi
 
+# TODO - this check should detect cygwin terminal, not just xterm.
 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 $SBT_OPTS -jar "$WDIR/sbt-launch.jar" "$@"
+  "$JAVA_CMD" $JAVA_OPTS -Djline.terminal=unix $SBT_OPTS -jar "$WDIR/sbt-launch.jar" "$@"
+  SCALA_STATUS=$?
   stty icanon echo > /dev/null 2>&1
+  exit $SCALA_STATUS
 else
   # Use Jansi to intercept ANSI sequences
-  "$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" SbtJansiLaunch "$@"
+  "$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/sbt-launch.jar" xsbt.boot.Boot "$@"
 fi
diff --git a/src/windows/sbt.bat b/src/windows/sbt.bat
index 6af06e415..854a4a85c 100644
--- a/src/windows/sbt.bat
+++ b/src/windows/sbt.bat
@@ -40,7 +40,7 @@ if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=%CFG_OPTS%
 
 :run
 
-"%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -cp "%SBT_HOME%sbt-launch.jar;%SBT_HOME%classes" xsbt.boot.Boot %*
+"%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -cp "%SBT_HOME%sbt-launch.jar" xsbt.boot.Boot %*
 if ERRORLEVEL 1 goto error
 goto end