Skip to content

Commit f9e877e

Browse files
committed
Remove unnecessary evals, escape extra params
1 parent d5bdea8 commit f9e877e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

bin/common

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ if [ ! -f "$version" ] || [ ! -z "$new_files" ]; then
2020
(cd $ROOT && sbt "dist/pack")
2121
fi
2222

23-
eval "$target" "$@"
23+
"$target" "$@"

bin/dotc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
44

5-
eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotc" "$@"
5+
"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotc" "$@"

bin/dotd

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
44

5-
eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotd" "$@"
5+
"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotd" "$@"

bin/dotr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
44

5-
eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotr" "$@"
5+
"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotr" "$@"

dist/bin/dotc

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ ReplMain=dotty.tools.repl.Main
3737
PROG_NAME=$CompilerMain
3838

3939
addJava () {
40-
java_args+=("$1")
40+
java_args+=("'$1'")
4141
}
4242
addScala () {
43-
scala_args+=("$1")
43+
scala_args+=("'$1'")
4444
}
4545
addResidual () {
46-
residual_args+=("$1")
46+
residual_args+=("'$1'")
4747
}
4848

4949
classpathArgs () {

dist/bin/dotr

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ if [ -z "$PROG_HOME" ] ; then
2828
fi
2929

3030
addJvmOptions () {
31-
jvm_options+=("$1")
31+
jvm_options+=("'$1'")
3232
}
3333

3434
addDotcOptions () {
35-
java_options+=("$1")
35+
java_options+=("'$1'")
3636
}
3737

3838
source "$PROG_HOME/bin/common"

0 commit comments

Comments
 (0)