From a54a5e4ca699d4ef305c72747474af12f50c74bd Mon Sep 17 00:00:00 2001
From: Diane Holt <holtdl@apache.org>
Date: Mon, 1 Apr 2002 03:58:50 +0000
Subject: [PATCH] More quoting cruft. (Maybe we should just put the entire
 script inside one giant quote! :)  (PR 4340)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272142 13f79535-47bb-0310-9956-ffa450edef68
---
 src/script/ant | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/script/ant b/src/script/ant
index ef4093146..b79123dfe 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -65,9 +65,9 @@ if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME"  ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
       # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD=$JAVA_HOME/jre/sh/java
+      JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-      JAVACMD=$JAVA_HOME/bin/java
+      JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
     JAVACMD=java
@@ -81,7 +81,7 @@ if [ ! -x "$JAVACMD" ] ; then
 fi
 
 if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH=$CLASSPATH
+  LOCALCLASSPATH="$CLASSPATH"
 fi
 
 # add in the dependency .jar files
@@ -94,18 +94,18 @@ do
       if [ -z "$LOCALCLASSPATH" ] ; then
         LOCALCLASSPATH=$i
       else
-        LOCALCLASSPATH="$i":$LOCALCLASSPATH
+        LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
       fi
     fi
 done
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
   fi
 
   if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
-    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
   fi
 
   # OSX hack to make Ant work with jikes
@@ -143,4 +143,4 @@ if $cygwin; then
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
 fi
 
-$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+"$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"