Skip to content

Commit f1598a7

Browse files
committed
updated comment; improved REPL for some versions of Mingw/Msys
1 parent e391d23 commit f1598a7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dist/bin/common

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CLASSPATH_SUFFIX=""
105105
# Path separator used in EXTRA_CLASSPATH
106106
PSEP=":"
107107

108-
# if $has_cypath, translate paths to Windows-mixed format before running java
108+
# translate paths to Windows-mixed format before running java
109109
if [ -n "$CYGPATHCMD" ]; then
110110
[ -n "$PROG_HOME" ] &&
111111
PROG_HOME=`"$CYGPATHCMD" -am "$PROG_HOME"`
@@ -114,7 +114,7 @@ if [ -n "$CYGPATHCMD" ]; then
114114
CLASSPATH_SUFFIX=";"
115115
PSEP=";"
116116
elif ($mingw || $msys); then
117-
# For Mingw / Msys, convert paths to UNIX format before anything is touched
117+
# For Mingw / Msys, convert paths from UNIX format before anything is touched
118118
[ -n "$PROG_HOME" ] &&
119119
PROG_HOME="`(cd "$PROG_HOME"; pwd -W | sed 's|/|\\\\|g')`"
120120
[ -n "$JAVA_HOME" ] &&
@@ -150,7 +150,7 @@ SBT_INTF=$(find_lib "*compiler-interface*")
150150
JLINE_READER=$(find_lib "*jline-reader-3*")
151151
JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
152152
JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
153-
JNA=$(find_lib "*jna-5*")
153+
[[ ($mingw||$msys) ]] || JNA=$(find_lib "*jna-5*")
154154

155155
# debug
156156
DEBUG_STR=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005

0 commit comments

Comments
 (0)