cleanup inconsistent classpath handling; use all optional scalac args

Author: philwalk

dist/bin/common

@@ -187,7 +187,11 @@ classpathArgs () {
   toolchain+="$JLINE_TERMINAL_JNA$PSEP"
   toolchain+="$JNA$PSEP"
 
-  jvm_cp_args="-classpath \"$toolchain\""
+  if [ -n "$jvm_cp_args" ]; then
+    jvm_cp_args="$toolchain$jvm_cp_args"
+  else
+    jvm_cp_args="$toolchain$PSEP"
+  fi
 }
 
 default_java_opts="-Xmx768m -Xms768m"

dist/bin/scala

@@ -151,9 +151,19 @@ if [ $execute_script == true ]; then
   else
     [[ $save_compiled == true ]] && rm -f $target_jar
     set -- ${cp_arg-} ${java_options[@]} ${residual_args[@]} -script "$target_script" ${script_args[@]}
+    PROG_MAIN=$ScriptingMain
     prepScalacCommandLine "$@"
     # exec here would prevent onExit from being called, leaving terminal in unusable state
-    eval "\"$JAVACMD\"" "$DEBUG"  "-classpath \"$cp_arg\"" "${java_args[@]}" "${residual_args[@]}"
+    eval "\"$JAVACMD\"" \
+         ${JAVA_OPTS:-$default_java_opts} \
+         "${DEBUG-}" \
+         "${java_args[@]}" \
+         "-classpath \"$jvm_cp_args\"" \
+         -Dscala.usejavacp=true \
+         "$PROG_NAME"  \
+         "${scala_args[@]}" \
+         "${residual_args[@]}" \
+         "${scripting_string-}"
     scala_exit_status=$?
   fi
 elif [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicator == 0 ]); then

dist/bin/scalac

@@ -28,16 +28,17 @@ fi
 
 source "$PROG_HOME/bin/common"
 
-PROG_NAME=$CompilerMain
+[ -z "$PROG_NAME" ] && PROG_NAME=$CompilerMain
 
 prepScalacCommandLine "$@"
 
 # exec here would prevent onExit from being called, leaving terminal in unusable state
+[ -n "$script_trace" ] && set -x
 eval "\"$JAVACMD\"" \
      ${JAVA_OPTS:-$default_java_opts} \
      "${DEBUG-}" \
      "${java_args[@]}" \
-     "$jvm_cp_args" \
+     -classpath "$jvm_cp_args" \
      -Dscala.usejavacp=true \
      "$PROG_NAME"  \
      "${scala_args[@]}" \