Merge pull request scala#4465 from retronym/ticket/9279

lrytz · lrytz · commit 48f4a99fc7c0 · 2015-04-27T09:31:57.000+02:00
SI-9279 Improve performance of bash runner script
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -137,17 +137,17 @@ while [[ $# -gt 0 ]]; do
     -D*)
       # pass to scala as well: otherwise we lose it sometimes when we
       # need it, e.g. communicating with a server compiler.
-      java_args=("${java_args[@@]}" "$1")
-      scala_args=("${scala_args[@@]}" "$1")
+      java_args+=("$1")
+      scala_args+=("$1")
       # respect user-supplied -Dscala.usejavacp
       case "$1" in -Dscala.usejavacp*) OVERRIDE_USEJAVACP="";; esac
       shift
       ;;
     -J*)
       # as with -D, pass to scala even though it will almost
       # never be used.
-      java_args=("${java_args[@@]}" "${1:2}")
-      scala_args=("${scala_args[@@]}" "$1")
+      java_args+=("${1:2}")
+      scala_args+=("$1")
       shift
       ;;
     -toolcp)
@@ -167,7 +167,7 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     *)
-      scala_args=("${scala_args[@@]}" "$1")
+      scala_args+=("$1")
       shift
       ;;
   esac
