Turns out the cygwin fix involved a bit more work.

We can't exec bash, because we can't give over our process to sbt
if we want to turn echo back on later.
This commit is contained in:
Josh Suereth 2013-07-30 19:49:17 -04:00
parent 19f9330c32
commit 1a07150560
2 changed files with 8 additions and 4 deletions

View File

@ -56,6 +56,8 @@ cygwinpath() {
fi
}
echo "Loading $(dirname "$(realpath "$0")")/sbt-launch-lib.bash"
. "$(dirname "$(realpath "$0")")/sbt-launch-lib.bash"

View File

@ -56,7 +56,9 @@ execRunner () {
echo ""
}
exec "$@"
# THis used to be exec, but we loose the ability to re-hook stty then
# for cygwin... Maybe we should flag the feature here...
"$@"
}
addJava () {
@ -182,12 +184,12 @@ run() {
execRunner "$java_cmd" \
${SBT_OPTS:-$default_sbt_opts} \
$(get_mem_opts $sbt_mem) \
${java_opts} \
${java_opts} \
${java_args[@]} \
-jar "$sbt_jar" \
"${sbt_commands[@]}" \
"${residual_args[@]}"
"${residual_args[@]}"
exit_code=$?
# Clean up the terminal from cygwin hacks.