more robust script detection in dist/bin/scala

Author: philwalk

dist/bin/scala

@@ -78,7 +78,7 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     -save|-savecompiled)
-      save_compiled=1
+      save_compiled=true
       addDotcOptions "${1}"
       shift
       ;;
@@ -93,10 +93,11 @@ while [[ $# -gt 0 ]]; do
     *)
       if [ $execute_script == false ]; then
         # is a script if extension .scala or .sc or if has scala hash bang
-        if [[ "$1" == *.scala || "$1" == *.sc || -f "$1" && `head -n 1 -- "$1" | grep '#!.*scala'` ]]; then
+        if [[ -e "$1" && ("$1" == *.scala || "$1" == *.sc || -f "$1" && `head -n 1 -- "$1" | grep '#!.*scala'`) ]]; then
           execute_script=true
           [ -n "$SCALA_OPTS" ] && java_options+=($SCALA_OPTS)
           target_script="$1"
+          if [ ! -f $target_script
         else
           residual_args+=("$1")
         fi
@@ -113,9 +114,9 @@ if [ $execute_script == true ]; then
   if [ "$CLASS_PATH" ]; then
     cp_arg="-classpath \"$CLASS_PATH\""
   fi
+  setScriptName="-Dscript.path=$target_script"
   target_jar="${target_script%.*}.jar"
   jar_found=false
-  setScriptName="-Dscript.path=$target_script"
   [[ $save_compiled == true && -f "$target_jar" ]] && jar_found=true
   if [[ $jar_found == true && "$target_jar" -nt "$target_script" ]]; then
     java $setScriptName -jar "$target_jar" "${script_args[@]}"