]>
Commit | Line | Data |
---|---|---|
31926d52 | 1 | --- apache-ant-1.6.1/src/script/ant.fix 2004-03-31 20:54:36.093281896 +0200 |
2 | +++ apache-ant-1.6.1/src/script/ant 2004-03-31 20:55:32.140761384 +0200 | |
3 | @@ -47,14 +47,13 @@ | |
285564b2 | 4 | |
31926d52 | 5 | if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then |
285564b2 | 6 | # try to find ANT |
31926d52 | 7 | - if [ -d /opt/ant ] ; then |
8 | + if [ -f /usr/share/java/ant.jar ] ; then | |
285564b2 | 9 | + ANT_HOME=/usr/share/java |
31926d52 | 10 | + elif [ -d /opt/ant ] ; then |
285564b2 AF |
11 | ANT_HOME=/opt/ant |
12 | - fi | |
13 | - | |
31926d52 | 14 | - if [ -d "${HOME}/opt/ant" ] ; then |
15 | + elif [ -d "${HOME}/opt/ant" ] ; then | |
e210b8c4 | 16 | ANT_HOME="${HOME}/opt/ant" |
285564b2 | 17 | - fi |
31926d52 | 18 | - |
e210b8c4 | 19 | + else |
285564b2 | 20 | ## resolve links - $0 may be a link to ant's home |
e210b8c4 | 21 | PRG="$0" |
31926d52 | 22 | progname=`basename "$0"` |
23 | @@ -71,7 +70,7 @@ | |
24 | done | |
e210b8c4 | 25 | |
31926d52 | 26 | ANT_HOME=`dirname "$PRG"`/.. |
27 | - | |
e210b8c4 | 28 | + fi |
e210b8c4 AM |
29 | # make it fully qualified |
30 | ANT_HOME=`cd "$ANT_HOME" && pwd` | |
026df7b0 | 31 | fi |