|
91 | 91 |
|
92 | 92 | if [ "$JLINE_JAR" == "" ]
|
93 | 93 | then
|
94 |
| - JLINE_JAR=$HOME/.ivy2//cache/jline/jline/jars/jline-$JLINE_VERSION.jar |
| 94 | + JLINE_JAR=$HOME/.ivy2/cache/jline/jline/jars/jline-$JLINE_VERSION.jar |
95 | 95 | fi
|
96 | 96 |
|
97 | 97 | if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR" -o ! -f "$SCALA_COMPILER_JAR" -o ! -f "$JLINE_JAR" ]
|
@@ -188,11 +188,30 @@ trap onExit INT
|
188 | 188 | # If using the boot classpath, also pass an empty classpath
|
189 | 189 | # to java to suppress "." from materializing.
|
190 | 190 | classpathArgs () {
|
191 |
| - if [[ -n $bootcp ]]; then |
192 |
| -echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR" |
| 191 | + toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR" |
| 192 | + if [[ -n "$cygwin" ]]; then |
| 193 | + if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then |
| 194 | + format=mixed |
| 195 | + else |
| 196 | + format=windows |
| 197 | + fi |
| 198 | + |
| 199 | + if [[ -n $bootcp ]]; then |
| 200 | + boot_classpath="$(cygpath --path --$format "$toolchain:$MAIN_JAR")" |
| 201 | + classpath="$(cygpath --path --$format "$MAIN_JAR:$TEST_JAR")" |
| 202 | + cpArgs="-Xbootclasspath/a:$boot_classpath -classpath $classpath" |
| 203 | + else |
| 204 | + classpath="$(cygpath --path --$format "$toolchain:$MAIN_JAR:$TEST_JAR")" |
| 205 | + cpArgs="-classpath $classpath" |
| 206 | + fi |
193 | 207 | else
|
194 |
| -echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR:$TEST_JAR" |
| 208 | + if [[ -n $bootcp ]]; then |
| 209 | + cpArgs="-Xbootclasspath/a:$toolchain:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR" |
| 210 | + else |
| 211 | + cpArgs="-classpath $toolchain:$MAIN_JAR:$TEST_JAR" |
| 212 | + fi |
195 | 213 | fi
|
| 214 | + echo ${cpArgs} |
196 | 215 | }
|
197 | 216 |
|
198 | 217 | # e.g. path -java-home /path/to/java_home
|
|
0 commit comments