Browse Source

Make wrapper script work if ant is a relative symlink and ANT_HOME

isn't set.

PR: 17721
Submitted by:	Martin Frost <martin at macrospace dot com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274318 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
5af1ce76d2
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      WHATSNEW
  2. +1
    -1
      src/script/ant

+ 3
- 0
WHATSNEW View File

@@ -72,6 +72,9 @@ Fixed bugs:

* starteam checkout can now handle deleted labels. Bugzilla Report 17646.

* The Unix wrapper script failed if you invoked it as a relative
symlink and ANT_HOME has not been set. Bugzilla Report 17721.

Other changes:
--------------
* The filesetmanifest attribute of <jar> has been reenabled.


+ 1
- 1
src/script/ant View File

@@ -51,7 +51,7 @@ if [ -z "$ANT_HOME" ] ; then
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '.*/.*' > /dev/null; then
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"


Loading…
Cancel
Save