aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>1999-11-22 05:57:09 +0000
committerEric Andersen <andersen@codepoet.org>1999-11-22 05:57:09 +0000
commit0f4c0848c7057dd696d82f9a0ca5cc8749a4131a (patch)
tree8721b734d86d813ea2e929d706a88e0236b96439
parent0727458a97350158340b81c874ad7bce4378b96c (diff)
downloadbusybox-0f4c0848c7057dd696d82f9a0ca5cc8749a4131a.tar.gz
Fix bugs
-rwxr-xr-xapplets/install.sh7
-rwxr-xr-xinstall.sh7
2 files changed, 4 insertions, 10 deletions
diff --git a/applets/install.sh b/applets/install.sh
index 5f0d2d5da..9721102a1 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -6,18 +6,15 @@ if [ "$1" == "" ]; then
echo "No installation directory, aborting."
exit 1;
fi
-rm -rf $1
h=`sort busybox.links | uniq`
for i in $h ; do
- echo "working on $i now"
+ echo "Symlinking $i to /bin/busybox"
mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `;
myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `;
- echo "mkdir -p $1$mypath"
- echo "(cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )"
mkdir -p $1$mypath
- (cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )
+ (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp )
done
rm -f $1/bin/busybox
install -m 755 busybox $1/bin/busybox
diff --git a/install.sh b/install.sh
index 5f0d2d5da..9721102a1 100755
--- a/install.sh
+++ b/install.sh
@@ -6,18 +6,15 @@ if [ "$1" == "" ]; then
echo "No installation directory, aborting."
exit 1;
fi
-rm -rf $1
h=`sort busybox.links | uniq`
for i in $h ; do
- echo "working on $i now"
+ echo "Symlinking $i to /bin/busybox"
mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `;
myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `;
- echo "mkdir -p $1$mypath"
- echo "(cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )"
mkdir -p $1$mypath
- (cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )
+ (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp )
done
rm -f $1/bin/busybox
install -m 755 busybox $1/bin/busybox