From b9c907a5a5b453eca6aeea1b73d3d950e20ad3e4 Mon Sep 17 00:00:00 2001
From: Jeffrey Adamson <jwadamson@us.ibm.com>
Date: Wed, 22 Apr 2015 08:44:13 -0400
Subject: [PATCH] GROOVY-7378: Support JAVA_OPTS containing quoted arguments on
 *nix

---
 src/bin/startGroovy | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bin/startGroovy b/src/bin/startGroovy
index 0aae91d6362..26014f1a765 100644
--- a/src/bin/startGroovy
+++ b/src/bin/startGroovy
@@ -261,18 +261,18 @@ startGroovy ( ) {
     if $useprofiler ; then
         runProfiler
     else
-        exec "$JAVACMD" $JAVA_OPTS \
-            -classpath "$STARTER_CLASSPATH" \
-            -Dscript.name="$SCRIPT_PATH" \
-            -Dprogram.name="$PROGNAME" \
-            -Dgroovy.starter.conf="$GROOVY_CONF" \
-            -Dgroovy.home="$GROOVY_HOME" \
-            -Dtools.jar="$TOOLS_JAR" \
+        eval exec "\"\$JAVACMD\"" $JAVA_OPTS \
+            -classpath "\"\$STARTER_CLASSPATH\"" \
+            -Dscript.name="\"\$SCRIPT_PATH\"" \
+            -Dprogram.name="\"\$PROGNAME\"" \
+            -Dgroovy.starter.conf="\"\$GROOVY_CONF\"" \
+            -Dgroovy.home="\"\$GROOVY_HOME\"" \
+            -Dtools.jar="\"\$TOOLS_JAR\"" \
             $STARTER_MAIN_CLASS \
             --main $CLASS \
-            --conf "$GROOVY_CONF" \
-            --classpath "$CP" \
-            "$@"
+            --conf "\"\$GROOVY_CONF\"" \
+            --classpath "\"\$CP\"" \
+            "\"\$@\""
     fi
 }