bodewig 2003/03/27 00:24:21
Modified: . WHATSNEW src/script ant Log: 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> Revision Changes Path 1.372 +3 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- WHATSNEW 27 Mar 2003 08:02:15 -0000 1.371 +++ WHATSNEW 27 Mar 2003 08:24:21 -0000 1.372 @@ -72,6 +72,9 @@ * 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.35 +1 -1 ant/src/script/ant Index: ant =================================================================== RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ant 7 Mar 2003 08:42:26 -0000 1.34 +++ ant 27 Mar 2003 08:24:21 -0000 1.35 @@ -51,7 +51,7 @@ 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"