ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hol...@apache.org
Subject cvs commit: jakarta-ant/src/script ant
Date Mon, 01 Apr 2002 03:58:50 GMT
holtdl      02/03/31 19:58:50

  Modified:    src/script ant
  Log:
  More quoting cruft. (Maybe we should just put the entire
  script inside one giant quote! :)  (PR 4340)
  
  Revision  Changes    Path
  1.15      +7 -7      jakarta-ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/ant,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ant	28 Feb 2002 00:01:05 -0000	1.14
  +++ ant	1 Apr 2002 03:58:50 -0000	1.15
  @@ -65,9 +65,9 @@
     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 @@
   fi
   
   if [ -n "$CLASSPATH" ] ; then
  -  LOCALCLASSPATH=$CLASSPATH
  +  LOCALCLASSPATH="$CLASSPATH"
   fi
   
   # add in the dependency .jar files
  @@ -94,18 +94,18 @@
         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 @@
     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 "$@"
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message