diff options
| author | Pavel Roskin <proski@gnu.org> | 2000-07-28 19:34:02 +0000 |
|---|---|---|
| committer | Pavel Roskin <proski@gnu.org> | 2000-07-28 19:34:02 +0000 |
| commit | 259972e5657847313077dfd2ab8e84f065a82811 (patch) | |
| tree | 9eca6d0e6d9ba64d4f1da68e7dc00f9e6bd44952 | |
| parent | 9cf306d55e36bf783e46b080f15112f0cc509549 (diff) | |
| download | busybox-259972e5657847313077dfd2ab8e84f065a82811.tar.gz | |
Disabled debugging output
Fine-grained checks for possible errors instead of "set -e"
The standard output shows what is being linked to what
| -rwxr-xr-x | applets/install.sh | 14 | ||||
| -rwxr-xr-x | install.sh | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/applets/install.sh b/applets/install.sh index 1ca7183c8..8cfae3740 100755 --- a/applets/install.sh +++ b/applets/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -set -e -set -x prefix=$1 if [ "$prefix" = "" ]; then echo "No installation directory, aborting." @@ -15,13 +13,13 @@ fi h=`sort busybox.links | uniq` -rm -f $prefix/bin/busybox -mkdir -p $prefix/bin -install -m 755 busybox $prefix/bin/busybox +rm -f $prefix/bin/busybox || exit 1 +mkdir -p $prefix/bin || exit 1 +install -m 755 busybox $prefix/bin/busybox || exit 1 for i in $h ; do appdir=`dirname $i` - mkdir -p $prefix/$appdir + mkdir -p $prefix/$appdir || exit 1 if [ "$2" = "--hardlinks" ]; then bb_path="$prefix/bin/busybox" else @@ -44,8 +42,8 @@ for i in $h ; do ;; esac fi - echo " $prefix$i -> /bin/busybox" - ln $linkopts $bb_path $prefix$i + echo " $prefix$i -> $bb_path" + ln $linkopts $bb_path $prefix$i || exit 1 done exit 0 diff --git a/install.sh b/install.sh index 1ca7183c8..8cfae3740 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -set -e -set -x prefix=$1 if [ "$prefix" = "" ]; then echo "No installation directory, aborting." @@ -15,13 +13,13 @@ fi h=`sort busybox.links | uniq` -rm -f $prefix/bin/busybox -mkdir -p $prefix/bin -install -m 755 busybox $prefix/bin/busybox +rm -f $prefix/bin/busybox || exit 1 +mkdir -p $prefix/bin || exit 1 +install -m 755 busybox $prefix/bin/busybox || exit 1 for i in $h ; do appdir=`dirname $i` - mkdir -p $prefix/$appdir + mkdir -p $prefix/$appdir || exit 1 if [ "$2" = "--hardlinks" ]; then bb_path="$prefix/bin/busybox" else @@ -44,8 +42,8 @@ for i in $h ; do ;; esac fi - echo " $prefix$i -> /bin/busybox" - ln $linkopts $bb_path $prefix$i + echo " $prefix$i -> $bb_path" + ln $linkopts $bb_path $prefix$i || exit 1 done exit 0 |