aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-24 09:10:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-24 09:10:56 +0000
commit060598965503ba0f0a1e818f0251bff2e01cac1d (patch)
treecc11b617fed610070c0acd2ac2b61b0b87824e1f /main
parent5245d5bdffdee245ab1bc626b5fc73783d86c8d5 (diff)
downloadaports-060598965503ba0f0a1e818f0251bff2e01cac1d.tar.gz
aports-060598965503ba0f0a1e818f0251bff2e01cac1d.tar.bz2
aports-060598965503ba0f0a1e818f0251bff2e01cac1d.tar.xz
main/busybox: remove old /bin/install symlink when upgrading
We have moved /bin/install to /usr/bin/install. The old symlink should go away when upgrading and trigger script will not do it. So we do it in post-upgrade
Diffstat (limited to 'main')
-rw-r--r--main/busybox/APKBUILD2
-rw-r--r--main/busybox/busybox.post-install3
-rw-r--r--[l---------]main/busybox/busybox.post-upgrade10
3 files changed, 12 insertions, 3 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 4c11b21590..6d27a88b2b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.18.5
-pkgrel=0
+pkgrel=1
_bbsuidver=0.6
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install
index 8baed730c6..a986b2f766 100644
--- a/main/busybox/busybox.post-install
+++ b/main/busybox/busybox.post-install
@@ -1,3 +1,4 @@
#!/bin/sh
-/bin/busybox --install -s
+# We need the symlinks early
+exec /bin/busybox --install -s
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 1f4b450e5e..c55561cc11 120000..100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -1 +1,9 @@
-busybox.post-install \ No newline at end of file
+#!/bin/sh
+
+# /bin/install has moved to /usr/bin/install, but we need remove old link
+if [ -L /bin/install ] && [ "$(readlink /bin/install)" = "/bin/busybox" ]; then
+ rm /bin/install
+fi
+
+# We need the symlinks early
+exec /bin/busybox --install -s