summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorStefan Bodewig <bodewig@apache.org>2008-08-08 13:20:58 +0000
committerStefan Bodewig <bodewig@apache.org>2008-08-08 13:20:58 +0000
commit105c2b80c13465f30e95f012ee1c44cead088d25 (patch)
tree127a08ba12d66794140881959958906cef9be056 /src/script
parent834973f3857ebda58fc87c7ffc148a5d3acaaf21 (diff)
downloadant-105c2b80c13465f30e95f012ee1c44cead088d25.tar.gz
make sure JAVA_HOME and ANT_HOME are set before passing them to cygpath. PR 45245.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@683961 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/script')
-rw-r--r--src/script/ant4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/ant b/src/script/ant
index 2e6083924..07ecccfbb 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -251,9 +251,9 @@ if $cygwin; then
else
format=windows
fi
- ANT_HOME=`cygpath --$format "$ANT_HOME"`
+ [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"`
ANT_LIB=`cygpath --$format "$ANT_LIB"`
- JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
if [ -n "$CLASSPATH" ] ; then