diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-08-12 01:37:56 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-08-28 08:40:42 +0000 |
| commit | b506a63a0ac97f2c5c1ad9ef3435c898f165e2d8 (patch) | |
| tree | 4154ecaa151ee253a578874bcb116abf95f92e85 /main/sed | |
| parent | 31e9fce843cb75e2fc1e725ff766030f80a58b2a (diff) | |
| download | aports-b506a63a0ac97f2c5c1ad9ef3435c898f165e2d8.tar.bz2 aports-b506a63a0ac97f2c5c1ad9ef3435c898f165e2d8.tar.xz | |
main/sed: fix deinstall script and modernise APKBUILD
Diffstat (limited to 'main/sed')
| -rw-r--r-- | main/sed/APKBUILD | 12 | ||||
| -rw-r--r-- | main/sed/sed.post-deinstall | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD index 1fb8bdc389..6f78d927e5 100644 --- a/main/sed/APKBUILD +++ b/main/sed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sed pkgver=4.4 -pkgrel=0 +pkgrel=1 subpackages="$pkgname-doc" pkgdesc="GNU stream editor" url="http://www.gnu.org/software/sed" @@ -23,18 +23,16 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-i18n \ - --disable-nls \ - || return 1 - make || return 1 + --disable-nls + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install \ - || return 1 + make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/lib/charset.alias - rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true + rmdir -p "$pkgdir"/usr/lib 2>/dev/null } sha512sums="4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70 sed-4.4.tar.xz" diff --git a/main/sed/sed.post-deinstall b/main/sed/sed.post-deinstall index 81dde1ec59..5ec0031a45 100644 --- a/main/sed/sed.post-deinstall +++ b/main/sed/sed.post-deinstall @@ -1,6 +1,6 @@ #!/bin/sh -# we cannot rely on the busbox trigger since sed might be used from install +# we cannot rely on the busybox trigger since sed might be used from install # scripts -exec /bin/busybox --install -s +[ -x /bin/busybox ] && exec /bin/busybox --install -s |