File tree 1 file changed +7
-7
lines changed
1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ addJvmOptions () {
31
31
jvm_options+=(" '$1 '" )
32
32
}
33
33
34
- addDotcOptions () {
34
+ addScalacOptions () {
35
35
java_options+=(" '$1 '" )
36
36
}
37
37
@@ -76,16 +76,16 @@ while [[ $# -gt 0 ]]; do
76
76
shift
77
77
;;
78
78
@* |-color:* )
79
- addDotcOptions " ${1} "
79
+ addScalacOptions " ${1} "
80
80
shift
81
81
;;
82
82
-save|-savecompiled)
83
83
save_compiled=true
84
- dotc_script_options +=(" $1 " )
84
+ scala_script_options +=(" $1 " )
85
85
shift
86
86
;;
87
87
-compile-only)
88
- dotc_script_options +=(" $1 " )
88
+ scala_script_options +=(" $1 " )
89
89
shift
90
90
;;
91
91
-d)
@@ -94,7 +94,7 @@ while [[ $# -gt 0 ]]; do
94
94
;;
95
95
-J* )
96
96
addJvmOptions " ${1: 2} "
97
- addDotcOptions " ${1} "
97
+ addScalacOptions " ${1} "
98
98
shift ;;
99
99
* )
100
100
if [ $execute_script == false ]; then
@@ -119,11 +119,11 @@ if [ $execute_script == true ]; then
119
119
if [ " $CLASS_PATH " ]; then
120
120
cp_arg=" -classpath \" $CLASS_PATH \" "
121
121
fi
122
- java_options+=(${dotc_script_options } )
122
+ java_options+=(${scala_script_options } )
123
123
setScriptName=" -Dscript.path=$target_script "
124
124
target_jar=" ${target_script% .* } .jar"
125
125
if [[ $save_compiled == true && " $target_jar " -nt " $target_script " ]]; then
126
- java $setScriptName -jar " $target_jar " " ${script_args[@]} "
126
+ eval exec " \" $JAVACMD \" " $setScriptName -jar " $target_jar " " ${script_args[@]} "
127
127
else
128
128
[[ $save_compiled == true ]] && rm -f $target_jar
129
129
residual_args+=($setScriptName )
You can’t perform that action at this time.
0 commit comments