jon 00/12/13 10:58:38
Modified: . bootstrap.sh
Log:
remove unnecessary -f check cause -x does the job well enough
line wrap things to make it pretty.
Revision Changes Path
1.31 +9 -9 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bootstrap.sh 2000/12/13 09:34:10 1.30
+++ bootstrap.sh 2000/12/13 18:58:38 1.31
@@ -17,12 +17,6 @@
echo " to the installation directory of java."
fi
-if [ ! -f "$JAVA_HOME/bin/java" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We were unable to locate JAVA_HOME/bin/java"
- exit
-fi
-
if [ ! -x "$JAVA_HOME/bin/java" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute JAVA_HOME/bin/java"
@@ -83,12 +77,18 @@
echo ... Compiling Ant Classes
-${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java
${TOOLS}/ant/util/regexp/RegexpMatcher.java
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java ${TOOLS}/ant/util/*.java
${TOOLS}/ant/types/*.java ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java \
+ ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
+ ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
+ ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \
+ ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java
echo ... Copying Required Files
-cp src/main/org/apache/tools/ant/taskdefs/defaults.properties
${CLASSDIR}/org/apache/tools/ant/taskdefs
-cp src/main/org/apache/tools/ant/types/defaults.properties
${CLASSDIR}/org/apache/tools/ant/types
+cp src/main/org/apache/tools/ant/taskdefs/defaults.properties \
+ ${CLASSDIR}/org/apache/tools/ant/taskdefs
+cp src/main/org/apache/tools/ant/types/defaults.properties \
+ ${CLASSDIR}/org/apache/tools/ant/types
echo ... Building Ant Distribution
