bodewig 2002/08/09 00:24:14
Modified: src/script Tag: ANT_15_BRANCH ant antRun
Log:
Add a bunch of quotes.
partial merge from the HEAD branch
Revision Changes Path
No revision
No revision
1.19.2.6 +9 -9 jakarta-ant/src/script/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- ant 12 Jul 2002 15:16:27 -0000 1.19.2.5
+++ ant 9 Aug 2002 07:24:14 -0000 1.19.2.6
@@ -44,8 +44,8 @@
fi
## resolve links - $0 may be a link to ant's home
- PRG=$0
- progname=`basename $0`
+ PRG="$0"
+ progname=`basename "$0"`
saveddir=`pwd`
# need this for relative symlinks
@@ -57,7 +57,7 @@
if expr "$link" : '.*/.*' > /dev/null; then
PRG="$link"
else
- PRG="`dirname $PRG`/$link"
+ PRG=`dirname "$PRG"`"/$link"
fi
done
@@ -80,7 +80,7 @@
fi
# set ANT_LIB location
-ANT_LIB=${ANT_HOME}/lib
+ANT_LIB="${ANT_HOME}/lib"
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
@@ -111,14 +111,14 @@
for i in ant ant-optional jaxp_parser xml_apis
do
if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$JAVALIBDIR/$i.jar
+ LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
else
LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
fi
done
# in rpm mode ant/lib is in /usr/share/java/ant
-ANT_LIB=${JAVALIBDIR}/ant
+ANT_LIB="${JAVALIBDIR}/ant"
fi
@@ -127,9 +127,9 @@
do
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
- if [ "$i" != "${ANT_LIB}/*.jar" ] ; then
+ if [ -f "$i" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$i
+ LOCALCLASSPATH="$i"
else
LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
fi
@@ -151,7 +151,7 @@
if [ -d ${OSXHACK} ] ; then
for i in ${OSXHACK}/*.jar
do
- JIKESPATH=$JIKESPATH:$i
+ JIKESPATH="$JIKESPATH:$i"
done
fi
fi
1.2.2.1 +2 -2 jakarta-ant/src/script/antRun
Index: antRun
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/antRun,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- antRun 10 Jan 2002 14:18:42 -0000 1.2
+++ antRun 9 Aug 2002 07:24:14 -0000 1.2.2.1
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 2001 The Apache Software Foundation. All rights
+# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
# Args: DIR command
@@ -9,4 +9,4 @@
shift
shift
-exec $CMD "$@"
+exec "$CMD" "$@"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
