From 12140e607cad045a41aaeb2ea54d4d9938645f4a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 4 Apr 2011 03:53:23 +0200 Subject: [PATCH] fix install.sh Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Denys Vlasenko --- applets/install.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/applets/install.sh b/applets/install.sh index 32049b157..8f449d6b5 100755 --- a/applets/install.sh +++ b/applets/install.sh @@ -74,12 +74,12 @@ for i in $h; do echo "#!/bin/busybox" > $prefix$i chmod +x $prefix/$i fi - echo " $prefix$i" + echo " $prefix/$i" else if [ "$2" = "--hardlinks" ]; then bb_path="$prefix/bin/busybox" else - case "$appdir" in + case "/$appdir" in /) bb_path="bin/busybox" ;; @@ -92,17 +92,21 @@ for i in $h; do /usr/bin|/usr/sbin) bb_path="../../bin/busybox" ;; + /root) # root/linuxrc (?!) + bb_path="bin/busybox" + i=$(basename $i) + ;; *) echo "Unknown installation directory: $appdir" exit 1 ;; esac fi - if [ "$noclobber" = "0" ] || [ ! -e "$prefix$i" ]; then - echo " $prefix$i -> $bb_path" - ln $linkopts $bb_path $prefix$i || exit 1 + if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then + echo " $prefix/$i -> $bb_path" + ln $linkopts $bb_path $prefix/$i || exit 1 else - echo " $prefix$i already exists" + echo " $prefix/$i already exists" fi fi done