luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to scripts for working in both cygwin and cmd.exe. 

THis basically moves from jline.UnixTerminal to just unix.
This commit is contained in:
Josh Suereth 2013-06-17 12:56:18 -04:00
parent bec43f0a55
commit 3b9519b793
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows/sbt
View File

@ -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

2
src/windows/sbt.bat
View File

@ -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