From 7e5b93fbf8ba37281445c665ef7817437b16ed09 Mon Sep 17 00:00:00 2001 From: Stefan Zeiger Date: Wed, 18 Jan 2012 17:32:39 +0100 Subject: [PATCH] Make sbt/jline work properly in Cygwin's MinTTY terminal --- src/windows/sbt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/windows/sbt b/src/windows/sbt index f607847c5..e2fbdb5e6 100644 --- a/src/windows/sbt +++ b/src/windows/sbt @@ -1,7 +1,9 @@ #!/bin/sh - # sbt launcher script for Cygwin and MSYS +JAVA_CMD=java +JAVA_OPTS=-Xmx512M + UDIR=`dirname "$0"` if [ -z "$MSYSTEM" ]; then WDIR=`cygpath -alm "$UDIR"` @@ -11,10 +13,10 @@ fi if [ "_$TERM" = "_xterm" ]; then # Let the terminal handle ANSI sequences - LAUNCHER=xsbt.boot.Boot + stty -icanon min 1 -echo > /dev/null 2>&1 + $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 - LAUNCHER=SbtJansiLaunch + $JAVA_CMD $JAVA_OPTS -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" SbtJansiLaunch $@ fi - -java -Xmx512M -Dsbt.log.format=true -cp "$WDIR/jansi.jar;$WDIR/sbt-launch.jar;$WDIR/classes" $LAUNCHER $@