Merge pull request scala#15824 from rubin55/add-path-quoting-in-scripts

Added quotes to Scala home paths in scala and scalac scripts
nmcb · Aug 5, 2022 · 44a2f72 · 44a2f72
2 parents 5dee30b + 3905058
commit 44a2f72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dist/bin/scala b/dist/bin/scala
@@ -65,7 +65,7 @@ done
 # exec here would prevent onExit from being called, leaving terminal in unusable state
 compilerJavaClasspathArgs
 [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
-eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=$PROG_HOME" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
+eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
 scala_exit_status=$?
 
 

diff --git a/dist/bin/scalac b/dist/bin/scalac
@@ -87,7 +87,7 @@ eval "\"$JAVACMD\"" \
    "${java_args[@]}" \
    "-classpath \"$jvm_cp_args\"" \
    "-Dscala.usejavacp=true" \
-   "-Dscala.home=$PROG_HOME" \
+   "-Dscala.home=\"$PROG_HOME\"" \
    "dotty.tools.MainGenericCompiler" \
    "${scala_args[@]}"