groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pascalschumac...@apache.org
Subject groovy git commit: GROOVY-7378: Support JAVA_OPTS containing quoted arguments on *nix (closes #5)
Date Sat, 16 Jan 2016 12:32:33 GMT
Repository: groovy
Updated Branches:
  refs/heads/master a773f7b92 -> 0a79d156e


GROOVY-7378: Support JAVA_OPTS containing quoted arguments on *nix (closes #5)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0a79d156
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0a79d156
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0a79d156

Branch: refs/heads/master
Commit: 0a79d156e929a60b17aaced2b45027fad172e64e
Parents: a773f7b
Author: Jeffrey Adamson <jwadamson@us.ibm.com>
Authored: Wed Apr 22 08:44:13 2015 -0400
Committer: pascalschumacher <pascalschumacher@gmx.net>
Committed: Sat Jan 16 13:30:06 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/0a79d156/src/bin/startGroovy
----------------------------------------------------------------------
diff --git a/src/bin/startGroovy b/src/bin/startGroovy
index f0ebc50..36d6edd 100644
--- a/src/bin/startGroovy
+++ b/src/bin/startGroovy
@@ -283,18 +283,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
 }
 


Mime
View raw message