From cfa2a13b84f3b17379bc1b31e6affa00ac2a30a4 Mon Sep 17 00:00:00 2001
From: Phil <philwalk9@gmail.com>
Date: Mon, 10 May 2021 15:42:11 -0600
Subject: [PATCH 1/2] fix for #12405

---
 dist/bin/common | 4 +++-
 dist/bin/scalac | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dist/bin/common b/dist/bin/common
index cb0908c97563..c091e6bc8301 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -159,8 +159,10 @@ SBT_INTF=$(find_lib "*compiler-interface*")
 JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
 JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
-[[ ${conemu-} ]] || JNA=$(find_lib "*jna-5*")
 
+# jna-5 only appropriate for some combinations
+[[ ${conemu-} && ${msys-} ]] || JNA=$(find_lib "*jna-5*")
+#echo "conemu[${conemu}] msys[$msys] cygwin[$cygwin] JNA[$JNA]" 1>&2
 
 compilerJavaClasspathArgs () {
   # echo "dotty-compiler: $DOTTY_COMP"
diff --git a/dist/bin/scalac b/dist/bin/scalac
index fa93c41293bd..14a3998215c6 100755
--- a/dist/bin/scalac
+++ b/dist/bin/scalac
@@ -67,8 +67,10 @@ if [ "$PROG_NAME" == "$ScriptingMain" ]; then
   scripting_string="-script $target_script ${scripting_args[@]}"
 fi
 
-# exec here would prevent onExit from being called, leaving terminal in unusable state
 [ -n "$script_trace" ] && set -x
+[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
+
+# exec here would prevent onExit from being called, leaving terminal in unusable state
 eval "\"$JAVACMD\"" \
    ${JAVA_OPTS:-$default_java_opts} \
    "${java_args[@]}" \

From 1e299aa570b9c50bd48bfcff2fcc9cd6eebb8be2 Mon Sep 17 00:00:00 2001
From: Phil <philwalk9@gmail.com>
Date: Mon, 10 May 2021 15:46:59 -0600
Subject: [PATCH 2/2] removed debug printing

---
 dist/bin/common | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dist/bin/common b/dist/bin/common
index c091e6bc8301..2826e9e06708 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -162,7 +162,6 @@ JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
 
 # jna-5 only appropriate for some combinations
 [[ ${conemu-} && ${msys-} ]] || JNA=$(find_lib "*jna-5*")
-#echo "conemu[${conemu}] msys[$msys] cygwin[$cygwin] JNA[$JNA]" 1>&2
 
 compilerJavaClasspathArgs () {
   # echo "dotty-compiler: $DOTTY_COMP"