Fix bugs

git-svn-id: svn://busybox.net/trunk/busybox@113 69ca8d6d-28ef-0310-b511-8ec308f3f277

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