From f9e877eb8e4b17392455a812636e206211a2da4d Mon Sep 17 00:00:00 2001
From: Aleksander Boruch-Gruszecki <aleksander.boruch-gruszecki@epfl.ch>
Date: Mon, 10 Aug 2020 16:56:51 +0200
Subject: [PATCH] Remove unnecessary evals, escape extra params

---
 bin/common    | 2 +-
 bin/dotc      | 2 +-
 bin/dotd      | 2 +-
 bin/dotr      | 2 +-
 dist/bin/dotc | 6 +++---
 dist/bin/dotr | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/common b/bin/common
index 5293aca12a53..7d3aa7148265 100755
--- a/bin/common
+++ b/bin/common
@@ -20,4 +20,4 @@ if [ ! -f "$version" ] || [ ! -z "$new_files" ]; then
   (cd $ROOT && sbt "dist/pack")
 fi
 
-eval "$target" "$@"
+"$target" "$@"
diff --git a/bin/dotc b/bin/dotc
index 71b450f04e7e..34d5f08b6130 100755
--- a/bin/dotc
+++ b/bin/dotc
@@ -2,4 +2,4 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotc" "$@"
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotc" "$@"
diff --git a/bin/dotd b/bin/dotd
index c39f8a2a8c58..9079a88c63aa 100755
--- a/bin/dotd
+++ b/bin/dotd
@@ -2,4 +2,4 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotd" "$@"
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotd" "$@"
diff --git a/bin/dotr b/bin/dotr
index d461d6a09b56..a449b1488898 100755
--- a/bin/dotr
+++ b/bin/dotr
@@ -2,4 +2,4 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-eval "$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotr" "$@"
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/dotr" "$@"
diff --git a/dist/bin/dotc b/dist/bin/dotc
index 7a0fd239296e..491add6c1b7d 100755
--- a/dist/bin/dotc
+++ b/dist/bin/dotc
@@ -37,13 +37,13 @@ ReplMain=dotty.tools.repl.Main
 PROG_NAME=$CompilerMain
 
 addJava () {
-  java_args+=("$1")
+  java_args+=("'$1'")
 }
 addScala () {
-  scala_args+=("$1")
+  scala_args+=("'$1'")
 }
 addResidual () {
-  residual_args+=("$1")
+  residual_args+=("'$1'")
 }
 
 classpathArgs () {
diff --git a/dist/bin/dotr b/dist/bin/dotr
index 3a6dfcd3390b..edbabfe7e3db 100755
--- a/dist/bin/dotr
+++ b/dist/bin/dotr
@@ -28,11 +28,11 @@ if [ -z "$PROG_HOME" ] ; then
 fi
 
 addJvmOptions () {
-  jvm_options+=("$1")
+  jvm_options+=("'$1'")
 }
 
 addDotcOptions () {
-  java_options+=("$1")
+  java_options+=("'$1'")
 }
 
 source "$PROG_HOME/bin/common"