From d14dd7c393ffe3106aa639b397a1a8199c109d77 Mon Sep 17 00:00:00 2001 From: Dennis Groenen Date: Sat, 10 Sep 2011 17:46:49 +0200 Subject: [PATCH] minor fix in SYMLINK() for symlinking utilities that need the SUID bit set --- debian/scripts/install-binary.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/scripts/install-binary.sh b/debian/scripts/install-binary.sh index 0c5bf52..b0e2966 100755 --- a/debian/scripts/install-binary.sh +++ b/debian/scripts/install-binary.sh @@ -12,7 +12,7 @@ # By Dennis Groenen # GPLv3 licensed -# Version 0.4 08-02-2011 (MM-DD-YYYY) +# Version 0.41 09-10-2011 (MM-DD-YYYY) # 0.1: Initial release # 0.2: Use $EXECPWR to not have to rely on /bin/busybox' functions # Minor clean-ups and be quieter @@ -21,6 +21,7 @@ # Implement additional checks # 0.4: Add support for symlinking against busybox_root # Update email address +# 0.41: Minor fix in SYMLINK(), SUID symlinking part INSTALLDIR="/opt/busybox-power" EXECPWR="$INSTALLDIR/busybox.power" @@ -192,7 +193,7 @@ SYMLINK() { if test $SUID == 1; then if test -h $DIR/$APP # Check if the app is a symbolic link then - if test -n "`ls -l $DIR/$APP | grep busybox`" # Check if the symbolic link points to busybox + if test -n "`$EXECPWR ls -l $DIR/$APP | $EXECPWR grep busybox`" # Check if the symbolic link points to busybox then if test $VERBOSE == 1; then echo "Re-symlinking: $BUSYBOXROOT -> $DIR/$APP"; fi $EXECPWR rm $DIR/$APP -- 1.7.9.5