Browse Source

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
master
Diane Holt 23 years ago
parent
commit
a54a5e4ca6
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      src/script/ant

+ 7
- 7
src/script/ant View File

@@ -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 "$@"

Loading…
Cancel
Save