diff options
author | Eric Andersen <andersen@codepoet.org> | 1999-11-22 05:57:09 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 1999-11-22 05:57:09 +0000 |
commit | 0f4c0848c7057dd696d82f9a0ca5cc8749a4131a (patch) | |
tree | 8721b734d86d813ea2e929d706a88e0236b96439 | |
parent | 0727458a97350158340b81c874ad7bce4378b96c (diff) | |
download | busybox-w32-0f4c0848c7057dd696d82f9a0ca5cc8749a4131a.tar.gz busybox-w32-0f4c0848c7057dd696d82f9a0ca5cc8749a4131a.tar.bz2 busybox-w32-0f4c0848c7057dd696d82f9a0ca5cc8749a4131a.zip |
Fix bugs
-rwxr-xr-x | applets/install.sh | 7 | ||||
-rwxr-xr-x | install.sh | 7 |
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 | |||
6 | echo "No installation directory, aborting." | 6 | echo "No installation directory, aborting." |
7 | exit 1; | 7 | exit 1; |
8 | fi | 8 | fi |
9 | rm -rf $1 | ||
10 | 9 | ||
11 | h=`sort busybox.links | uniq` | 10 | h=`sort busybox.links | uniq` |
12 | 11 | ||
13 | for i in $h ; do | 12 | for i in $h ; do |
14 | echo "working on $i now" | 13 | echo "Symlinking $i to /bin/busybox" |
15 | mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; | 14 | mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; |
16 | myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; | 15 | myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; |
17 | echo "mkdir -p $1$mypath" | ||
18 | echo "(cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )" | ||
19 | mkdir -p $1$mypath | 16 | mkdir -p $1$mypath |
20 | (cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp ) | 17 | (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp ) |
21 | done | 18 | done |
22 | rm -f $1/bin/busybox | 19 | rm -f $1/bin/busybox |
23 | install -m 755 busybox $1/bin/busybox | 20 | 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 | |||
6 | echo "No installation directory, aborting." | 6 | echo "No installation directory, aborting." |
7 | exit 1; | 7 | exit 1; |
8 | fi | 8 | fi |
9 | rm -rf $1 | ||
10 | 9 | ||
11 | h=`sort busybox.links | uniq` | 10 | h=`sort busybox.links | uniq` |
12 | 11 | ||
13 | for i in $h ; do | 12 | for i in $h ; do |
14 | echo "working on $i now" | 13 | echo "Symlinking $i to /bin/busybox" |
15 | mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; | 14 | mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; |
16 | myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; | 15 | myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; |
17 | echo "mkdir -p $1$mypath" | ||
18 | echo "(cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp )" | ||
19 | mkdir -p $1$mypath | 16 | mkdir -p $1$mypath |
20 | (cd $1$mypath ; ln -s /bin/busybox $1$mypath$myapp ) | 17 | (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp ) |
21 | done | 18 | done |
22 | rm -f $1/bin/busybox | 19 | rm -f $1/bin/busybox |
23 | install -m 755 busybox $1/bin/busybox | 20 | install -m 755 busybox $1/bin/busybox |