diff options
-rwxr-xr-x | applets/install.sh | 10 | ||||
-rwxr-xr-x | install.sh | 10 |
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 | ||
3 | set -e | 3 | set -e |
4 | set -x | 4 | set -x |
5 | if [ "$1" = "" ]; then | 5 | prefix=$1 |
6 | if [ "$prefix" = "" ]; then | ||
6 | echo "No installation directory, aborting." | 7 | echo "No installation directory, aborting." |
7 | exit 1; | 8 | exit 1; |
8 | fi | 9 | fi |
@@ -11,13 +12,12 @@ if [ "$2" = "--hardlinks" ]; then | |||
11 | else | 12 | else |
12 | linkopts="-fs" | 13 | linkopts="-fs" |
13 | fi | 14 | fi |
14 | prefix=$1 | ||
15 | h=`sort busybox.links | uniq` | 15 | h=`sort busybox.links | uniq` |
16 | 16 | ||
17 | 17 | ||
18 | rm -f $1/bin/busybox | 18 | rm -f $prefix/bin/busybox |
19 | mkdir -p $1/bin | 19 | mkdir -p $prefix/bin |
20 | install -m 755 busybox $1/bin/busybox | 20 | install -m 755 busybox $prefix/bin/busybox |
21 | 21 | ||
22 | for i in $h ; do | 22 | for 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 | ||
3 | set -e | 3 | set -e |
4 | set -x | 4 | set -x |
5 | if [ "$1" = "" ]; then | 5 | prefix=$1 |
6 | if [ "$prefix" = "" ]; then | ||
6 | echo "No installation directory, aborting." | 7 | echo "No installation directory, aborting." |
7 | exit 1; | 8 | exit 1; |
8 | fi | 9 | fi |
@@ -11,13 +12,12 @@ if [ "$2" = "--hardlinks" ]; then | |||
11 | else | 12 | else |
12 | linkopts="-fs" | 13 | linkopts="-fs" |
13 | fi | 14 | fi |
14 | prefix=$1 | ||
15 | h=`sort busybox.links | uniq` | 15 | h=`sort busybox.links | uniq` |
16 | 16 | ||
17 | 17 | ||
18 | rm -f $1/bin/busybox | 18 | rm -f $prefix/bin/busybox |
19 | mkdir -p $1/bin | 19 | mkdir -p $prefix/bin |
20 | install -m 755 busybox $1/bin/busybox | 20 | install -m 755 busybox $prefix/bin/busybox |
21 | 21 | ||
22 | for i in $h ; do | 22 | for i in $h ; do |
23 | appdir=`dirname $i` | 23 | appdir=`dirname $i` |