emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled debugging output

Browse Source 
Fine-grained checks for possible errors instead of "set -e"
The standard output shows what is being linked to what
This commit is contained in:
Pavel Roskin 2000-07-28 19:34:02 +00:00
parent 9cf306d55e
commit 259972e565
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applets/install.sh
View File

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
set -x
prefix=$1 prefix=$1
if [ "$prefix" = "" ]; then if [ "$prefix" = "" ]; then
echo "No installation directory, aborting." echo "No installation directory, aborting."
@ -15,13 +13,13 @@ fi
h=`sort busybox.links | uniq` h=`sort busybox.links | uniq`
rm -f $prefix/bin/busybox rm -f $prefix/bin/busybox || exit 1
mkdir -p $prefix/bin mkdir -p $prefix/bin || exit 1
install -m 755 busybox $prefix/bin/busybox install -m 755 busybox $prefix/bin/busybox || exit 1
for i in $h ; do for i in $h ; do
appdir=`dirname $i` appdir=`dirname $i`
mkdir -p $prefix/$appdir mkdir -p $prefix/$appdir || exit 1
if [ "$2" = "--hardlinks" ]; then if [ "$2" = "--hardlinks" ]; then
bb_path="$prefix/bin/busybox" bb_path="$prefix/bin/busybox"
else else
@ -44,8 +42,8 @@ for i in $h ; do
;; ;;
esac esac
fi fi
echo " $prefix$i -> /bin/busybox" echo " $prefix$i -> $bb_path"
ln $linkopts $bb_path $prefix$i ln $linkopts $bb_path $prefix$i || exit 1
done done
exit 0 exit 0

14
install.sh
View File

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
set -x
prefix=$1 prefix=$1
if [ "$prefix" = "" ]; then if [ "$prefix" = "" ]; then
echo "No installation directory, aborting." echo "No installation directory, aborting."
@ -15,13 +13,13 @@ fi
h=`sort busybox.links | uniq` h=`sort busybox.links | uniq`
rm -f $prefix/bin/busybox rm -f $prefix/bin/busybox || exit 1
mkdir -p $prefix/bin mkdir -p $prefix/bin || exit 1
install -m 755 busybox $prefix/bin/busybox install -m 755 busybox $prefix/bin/busybox || exit 1
for i in $h ; do for i in $h ; do
appdir=`dirname $i` appdir=`dirname $i`
mkdir -p $prefix/$appdir mkdir -p $prefix/$appdir || exit 1
if [ "$2" = "--hardlinks" ]; then if [ "$2" = "--hardlinks" ]; then
bb_path="$prefix/bin/busybox" bb_path="$prefix/bin/busybox"
else else
@ -44,8 +42,8 @@ for i in $h ; do
;; ;;
esac esac
fi fi
echo " $prefix$i -> /bin/busybox" echo " $prefix$i -> $bb_path"
ln $linkopts $bb_path $prefix$i ln $linkopts $bb_path $prefix$i || exit 1
done done
exit 0 exit 0