Merge pull request #11428 from dotty-staging/fix-script

Fix for java command in bin/scala

Author: liufengyun

dist/bin/scala

@@ -31,7 +31,7 @@ addJvmOptions () {
   jvm_options+=("'$1'")
 }
 
-addDotcOptions () {
+addScalacOptions () {
   java_options+=("'$1'")
 }
 
@@ -76,16 +76,16 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     @*|-color:*)
-      addDotcOptions "${1}"
+      addScalacOptions "${1}"
       shift
       ;;
     -save|-savecompiled)
       save_compiled=true
-      dotc_script_options+=("$1")
+      scala_script_options+=("$1")
       shift
       ;;
     -compile-only)
-      dotc_script_options+=("$1")
+      scala_script_options+=("$1")
       shift
       ;;
     -d)
@@ -94,7 +94,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     -J*)
       addJvmOptions "${1:2}"
-      addDotcOptions "${1}"
+      addScalacOptions "${1}"
       shift ;;
     *)
       if [ $execute_script == false ]; then
@@ -119,11 +119,11 @@ if [ $execute_script == true ]; then
   if [ "$CLASS_PATH" ]; then
     cp_arg="-classpath \"$CLASS_PATH\""
   fi
-  java_options+=(${dotc_script_options})
+  java_options+=(${scala_script_options})
   setScriptName="-Dscript.path=$target_script"
   target_jar="${target_script%.*}.jar"
   if [[ $save_compiled == true && "$target_jar" -nt "$target_script" ]]; then
-    java $setScriptName -jar "$target_jar" "${script_args[@]}"
+    eval exec "\"$JAVACMD\"" $setScriptName -jar "$target_jar" "${script_args[@]}"
   else
     [[ $save_compiled == true ]] && rm -f $target_jar
     residual_args+=($setScriptName)