From 168f6c9ebd656db0959169c6da8454cd4e49fed3 Mon Sep 17 00:00:00 2001
From: Nico Seessle <nico@apache.org>
Date: Sat, 7 Jul 2001 16:29:49 +0000
Subject: [PATCH] Moved conversion of ANT_HOME to after the 'try to find ANT'
 section as suggested in Bug# 1479 by Daniel.Barclay@digitalfocus.com

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269290 13f79535-47bb-0310-9956-ffa450edef68
---
 src/script/ant | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/script/ant b/src/script/ant
index e96172147..365f90049 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -12,16 +12,6 @@ case "`uname`" in
   Darwin*) darwin=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$ANT_HOME" ] &&
-    ANT_HOME=`cygpath --unix "$ANT_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
 if [ -z "$ANT_HOME" ] ; then
   # try to find ANT
   if [ -d /opt/ant ] ; then 
@@ -50,6 +40,16 @@ if [ -z "$ANT_HOME" ] ; then
 
 fi
 
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$ANT_HOME" ] &&
+    ANT_HOME=`cygpath --unix "$ANT_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
 if [ -z "$JAVACMD" ] ; then 
   if [ -n "$JAVA_HOME"  ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then