From 4cce39e5f22c5ae0b2f5ea83f160f249064aae5f Mon Sep 17 00:00:00 2001 From: Jon Scott Stevens Date: Tue, 5 Dec 2000 07:32:14 +0000 Subject: [PATCH] removed requirement for JAVA_HOME to be defined, however, you will still need to have "java" in your path if it isn't defined. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268304 13f79535-47bb-0310-9956-ffa450edef68 --- src/bin/ant | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/bin/ant b/src/bin/ant index 6d3c9daf4..6c6fd26f3 100644 --- a/src/bin/ant +++ b/src/bin/ant @@ -45,11 +45,16 @@ if [ "$ANT_HOME" = "" ] ; then fi -# Allow .antrc to specifiy flags to java cmd -if [ "$JAVACMD" = "" ] ; then - JAVACMD=${JAVA_HOME}/bin/java +if [ "$JAVA_HOME" != "" ] ; then + if [ "$JAVACMD" = "" ] ; then + JAVACMD=$JAVA_HOME/bin/java + fi +else + if [ "$JAVACMD" = "" ] ; then + JAVACMD=java + fi fi - + # add in the dependency .jar files DIRLIBS=${ANT_HOME}/lib/*.jar for i in ${DIRLIBS}