The following commit has been merged in the master branch: commit 8b545db498fc59c69c41c794cd38f42d028955dc Merge: 87a29cce1ae75df49b5aa5a2b8397ac110edf045 2ab257cf7efef9f1bcd0fa839cca821573b4cc24 Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Tue Jan 11 18:41:13 2011 +0100
Merge commit 'upstream/0.38+ds2' diff --combined package/bin/osmosis index aaa4394,f822571..aaa4394 --- a/package/bin/osmosis +++ b/package/bin/osmosis @@@ -18,6 -18,25 +18,6 @@@ if [ -z "$JAVACMD" ] ; the JAVACMD=java fi -## resolve links - $0 may be a link to application -PRG="$0" - -# if started without absolute path, but from PATH environment -if [ ! -s "$PRG" ] ; then - PRG=`which $PRG` -fi - -# need this for relative symlinks -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi -done - if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then cat <<EOF osmosis -- Osmosis, an OSM data processor _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel