diff options
author | Kirill Khazan <kirillkh@gmail.com> | 2015-07-31 02:12:11 +0300 |
---|---|---|
committer | Kirill Khazan <kirillkh@gmail.com> | 2015-07-31 02:12:11 +0300 |
commit | 793fc445f6a57e116fb02f3a9abd7e522cd7bf66 (patch) | |
tree | 3bacd5a6023fe6414b303bbecf6fa6ebfc694afd /src | |
parent | a745f06e35e070061348e95725afb0def8ca45de (diff) | |
download | scala-793fc445f6a57e116fb02f3a9abd7e522cd7bf66.tar.gz scala-793fc445f6a57e116fb02f3a9abd7e522cd7bf66.tar.bz2 scala-793fc445f6a57e116fb02f3a9abd7e522cd7bf66.zip |
add support for MSys2 to bin/scala shell script
Diffstat (limited to 'src')
-rwxr-xr-x | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 6e91a2a202..fb384a340f 100755 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -67,6 +67,11 @@ if uname | grep -q ^MINGW; then mingw="$(uname)" fi +unset msys +if uname | grep -q ^MSYS; then + msys="$(uname)" +fi + # Finding the root folder for this Scala distribution SCALA_HOME="$(findScalaHome)" SEP=":" @@ -111,7 +116,7 @@ if [[ -n "$cygwin" ]]; then TOOL_CLASSPATH="$(cygpath --path --$format "$TOOL_CLASSPATH")" fi -if [[ -n "$cygwin$mingw" ]]; then +if [[ -n "$cygwin$mingw$msys" ]]; then case "$TERM" in rxvt* | xterm*) stty -icanon min 1 -echo @@ -182,10 +187,10 @@ fi declare -a classpath_args -# default to the boot classpath for speed, except on cygwin/mingw because +# default to the boot classpath for speed, except on cygwin/mingw/msys because # JLine on Windows requires a custom DLL to be loaded. unset usebootcp -if [[ -z "$cygwin$mingw" ]]; then +if [[ -z "$cygwin$mingw$msys" ]]; then usebootcp="true" fi |