delay expansion of command line args. PR 31601.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@704943 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -104,6 +104,7 @@ Gerrit Riessen
 Glenn McAllister
 Glenn Twiggs
 Greg Nelson
+Günther Kögel
 Harish Prabandham
 Haroon Rafique
 Hiroaki Nakamura

WHATSNEW

@@ -253,6 +253,10 @@ Fixed bugs:
    fails).
    Bugzilla Report 45028.
 
+ * the Unix "ant" wrapper script failed to protect wildcards in
+   command line arguments in some cases.
+   Bugzilla Report 31601.
+
 Other changes:
 --------------
 

contributors.xml

@@ -441,6 +441,10 @@
     <first>Greg</first>
     <last>Nelson</last>
   </name>
+  <name>
+    <first>Günther</first>
+    <last>Kögel</last>
+  </name>
   <name>
     <first>Harish</first>
     <last>Prabandham</last>

src/script/ant

@@ -319,8 +319,8 @@ else
     ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
   fi
 fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
 if $ant_exec_debug ; then
-    echo $ant_exec_command
+    echo $ant_exec_command $ant_exec_args
 fi
-eval $ant_exec_command
+eval $ant_exec_command "$ant_exec_args"