From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] ptxdist: Check for GNU readlink
Date: Tue, 14 Feb 2012 21:55:47 +0100 [thread overview]
Message-ID: <1329252947-118-1-git-send-email-bernhard@bwalle.de> (raw)
ptxdist heavily uses "readlink -f" which only works with GNU readlink.
So add the usual check here.
However, because "readlink -f" is also used before the symlinks in the
ptxdist directory is added to the PATH, that "readlink -f" call is
replaced by a bash-only implementation. This one is copied from
http://mailman.archlinux.org/pipermail/pacman-dev/2009-February/008130.html.
Tested on Mac OS 10.7.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
Makefile.in | 1 +
bin/ptxdist | 25 ++++++++++++++++++++++++-
configure.ac | 1 +
3 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e8544d1..2181608 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,7 @@ environment:
@ln -sf @PYTHON@ "$(abs_srcdir)/bin/python"
@ln -sf @SED@ "$(abs_srcdir)/bin/sed"
@ln -sf @TAR@ "$(abs_srcdir)/bin/tar"
+ @ln -sf @READLINK@ "$(abs_srcdir)/bin/readlink"
@echo " done"
clean:
diff --git a/bin/ptxdist b/bin/ptxdist
index eb3366a..9355b1f 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1843,6 +1843,29 @@ EOF
################ setup stuff only ################################
##################################################################
+#
+# bash implementation of realpath / readlink -f
+# arg1 - filename
+realpath()
+{
+ local fname oldfname
+
+ fname=${1%/} # strips trailing '/'
+ while [ -L "$fname" ]; do
+ oldfname="$fname"
+ fname="$(command ls -l $fname)"
+ fname="${fname#*\> }"
+ if [ "$fname" = . ] ; then
+ fname="$(dirname $oldfname)"
+ elif echo $fname | grep -vq '^/' - ; then
+ fname="$(dirname $oldfname)/$fname"
+ fi
+ done
+ pushd $(dirname $fname) > /dev/null
+ fname=$(pwd -P)/$(basename $fname)
+ popd > /dev/null
+ echo $fname
+}
#
# figure out PTXDIST_TOPDIR
@@ -1859,7 +1882,7 @@ EOF
setup_topdir() {
local ptxdist topdir
- ptxdist="$(readlink -f "${0}")" &&
+ ptxdist="$(realpath "${0}")" &&
topdir="$(cd "$(dirname "${ptxdist}")"/.. && pwd)" || return
#
diff --git a/configure.ac b/configure.ac
index 00c2521..497441c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ GNU_COREUTILS(md5sum)
GNU_COREUTILS(mkdir)
GNU_COREUTILS(install)
GNU_COREUTILS(stat)
+GNU_COREUTILS(readlink)
dnl Check for egrep
AC_PROG_EGREP
--
1.7.9
--
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2012-02-14 20:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-14 20:55 Bernhard Walle [this message]
2012-02-14 22:05 ` Michael Olbrich
2012-03-12 19:56 ` Bernhard Walle
2012-03-13 10:14 ` Michael Olbrich
2012-03-13 11:32 ` Bernhard Walle
2012-03-13 10:16 [ptxdist] [PATCH 2/2] " Michael Olbrich
2012-03-13 11:23 ` [ptxdist] [PATCH] " bernhard
2012-03-13 11:30 ` bernhard
2012-03-13 13:17 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329252947-118-1-git-send-email-bernhard@bwalle.de \
--to=bernhard@bwalle.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox