mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] ptxdist: Check for GNU readlink
@ 2012-02-14 20:55 Bernhard Walle
  2012-02-14 22:05 ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Bernhard Walle @ 2012-02-14 20:55 UTC (permalink / raw)
  To: ptxdist

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ptxdist: Check for GNU readlink
@ 2012-03-13 10:16 Michael Olbrich
  2012-03-13 11:23 ` [ptxdist] [PATCH] " bernhard
  2012-03-13 11:30 ` bernhard
  0 siblings, 2 replies; 8+ messages in thread
From: Michael Olbrich @ 2012-03-13 10:16 UTC (permalink / raw)
  To: ptxdist

On Mon, Mar 12, 2012 at 08:56:33PM +0100, Bernhard Walle wrote:
> 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 inspired 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  |   22 +++++++++++++++++++++-
>  configure.ac |    1 +
>  3 files changed, 23 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile.in b/Makefile.in
> index e62a2d9..17a6ce6 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -54,6 +54,7 @@ environment:
>  	@ln -sf @GNU_stat@ "$(abs_srcdir)/bin/stat"
>  	@ln -sf @GNU_mknod@ "$(abs_srcdir)/bin/mknod"
>  	@ln -sf @GNU_tar@ "$(abs_srcdir)/bin/tar"
> +	@ln -sf @GNU_readlink@ "$(abs_srcdir)/bin/readlink"
>  	@ln -sf @PYTHON@ "$(abs_srcdir)/bin/python"
>  	@ln -sf @SED@ "$(abs_srcdir)/bin/sed"
>  	@ln -sf @XARGS@ "$(abs_srcdir)/bin/xargs"
> diff --git a/bin/ptxdist b/bin/ptxdist
> index eb3366a..7636187 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1843,6 +1843,26 @@ 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="$(readlink ${fname})"
> +		if [ "$fname" = . ] ; then
> +			fname="$(dirname $oldfname)"
> +		elif [ "${fname}" = "${fname#/}" ]; then
> +			fname="$(dirname "${oldfname}")/${fname}"
> +		fi
> +	done
> +
> +	(cd $(dirname ${fname}); echo $(pwd -P)/$(basename ${fname}))

	(cd "$(dirname "${fname}")"; echo $(pwd -P)/$(basename "${fname}"))

just to make sure. I need to test this some more, but I think the rest is
ok now.

Michael

> +}
>  
>  #
>  # figure out PTXDIST_TOPDIR
> @@ -1859,7 +1879,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 37a01ae..780bf28 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -155,6 +155,7 @@ GNU_TOOL(mkdir, coreutils)
>  GNU_TOOL(install, coreutils)
>  GNU_TOOL(stat, coreutils)
>  GNU_TOOL(mknod, coreutils)
> +GNU_TOOL(readlink, coreutils)
>  GNU_TOOL(tar, tar)
>  
>  dnl Check for egrep
> -- 
> 1.7.9.2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-03-13 13:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-14 20:55 [ptxdist] [PATCH] ptxdist: Check for GNU readlink Bernhard Walle
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox