aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-04-04 03:53:23 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-04-04 03:53:23 +0200
commit12140e607cad045a41aaeb2ea54d4d9938645f4a (patch)
tree45503c56ef09d145cd408573525816e307e9f27f
parente32d05b708a31716e0a788c43f81990436535140 (diff)
downloadbusybox-w32-12140e607cad045a41aaeb2ea54d4d9938645f4a.tar.gz
busybox-w32-12140e607cad045a41aaeb2ea54d4d9938645f4a.tar.bz2
busybox-w32-12140e607cad045a41aaeb2ea54d4d9938645f4a.zip
fix install.sh
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xapplets/install.sh16
1 files 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
74 echo "#!/bin/busybox" > $prefix$i 74 echo "#!/bin/busybox" > $prefix$i
75 chmod +x $prefix/$i 75 chmod +x $prefix/$i
76 fi 76 fi
77 echo " $prefix$i" 77 echo " $prefix/$i"
78 else 78 else
79 if [ "$2" = "--hardlinks" ]; then 79 if [ "$2" = "--hardlinks" ]; then
80 bb_path="$prefix/bin/busybox" 80 bb_path="$prefix/bin/busybox"
81 else 81 else
82 case "$appdir" in 82 case "/$appdir" in
83 /) 83 /)
84 bb_path="bin/busybox" 84 bb_path="bin/busybox"
85 ;; 85 ;;
@@ -92,17 +92,21 @@ for i in $h; do
92 /usr/bin|/usr/sbin) 92 /usr/bin|/usr/sbin)
93 bb_path="../../bin/busybox" 93 bb_path="../../bin/busybox"
94 ;; 94 ;;
95 /root) # root/linuxrc (?!)
96 bb_path="bin/busybox"
97 i=$(basename $i)
98 ;;
95 *) 99 *)
96 echo "Unknown installation directory: $appdir" 100 echo "Unknown installation directory: $appdir"
97 exit 1 101 exit 1
98 ;; 102 ;;
99 esac 103 esac
100 fi 104 fi
101 if [ "$noclobber" = "0" ] || [ ! -e "$prefix$i" ]; then 105 if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
102 echo " $prefix$i -> $bb_path" 106 echo " $prefix/$i -> $bb_path"
103 ln $linkopts $bb_path $prefix$i || exit 1 107 ln $linkopts $bb_path $prefix/$i || exit 1
104 else 108 else
105 echo " $prefix$i already exists" 109 echo " $prefix/$i already exists"
106 fi 110 fi
107 fi 111 fi
108done 112done