aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapplets/install.sh10
-rwxr-xr-xinstall.sh10
2 files changed, 10 insertions, 10 deletions
diff --git a/applets/install.sh b/applets/install.sh
index 236f62a56..1ca7183c8 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -2,7 +2,8 @@
2 2
3set -e 3set -e
4set -x 4set -x
5if [ "$1" = "" ]; then 5prefix=$1
6if [ "$prefix" = "" ]; then
6 echo "No installation directory, aborting." 7 echo "No installation directory, aborting."
7 exit 1; 8 exit 1;
8fi 9fi
@@ -11,13 +12,12 @@ if [ "$2" = "--hardlinks" ]; then
11else 12else
12 linkopts="-fs" 13 linkopts="-fs"
13fi 14fi
14prefix=$1
15h=`sort busybox.links | uniq` 15h=`sort busybox.links | uniq`
16 16
17 17
18rm -f $1/bin/busybox 18rm -f $prefix/bin/busybox
19mkdir -p $1/bin 19mkdir -p $prefix/bin
20install -m 755 busybox $1/bin/busybox 20install -m 755 busybox $prefix/bin/busybox
21 21
22for i in $h ; do 22for i in $h ; do
23 appdir=`dirname $i` 23 appdir=`dirname $i`
diff --git a/install.sh b/install.sh
index 236f62a56..1ca7183c8 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,8 @@
2 2
3set -e 3set -e
4set -x 4set -x
5if [ "$1" = "" ]; then 5prefix=$1
6if [ "$prefix" = "" ]; then
6 echo "No installation directory, aborting." 7 echo "No installation directory, aborting."
7 exit 1; 8 exit 1;
8fi 9fi
@@ -11,13 +12,12 @@ if [ "$2" = "--hardlinks" ]; then
11else 12else
12 linkopts="-fs" 13 linkopts="-fs"
13fi 14fi
14prefix=$1
15h=`sort busybox.links | uniq` 15h=`sort busybox.links | uniq`
16 16
17 17
18rm -f $1/bin/busybox 18rm -f $prefix/bin/busybox
19mkdir -p $1/bin 19mkdir -p $prefix/bin
20install -m 755 busybox $1/bin/busybox 20install -m 755 busybox $prefix/bin/busybox
21 21
22for i in $h ; do 22for i in $h ; do
23 appdir=`dirname $i` 23 appdir=`dirname $i`