diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-08-08 12:22:41 +0200 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-08-13 11:25:58 +0000 |
| commit | 4331ce580fbe8236249828fa7c7913cc99d0c9e4 (patch) | |
| tree | b28e12dc25de79449fc621ce3e9301bed5243861 | |
| parent | 86f14fe466d97b1746442e0bd1791358bbf08e97 (diff) | |
| download | aports-4331ce580fbe8236249828fa7c7913cc99d0c9e4.tar.bz2 aports-4331ce580fbe8236249828fa7c7913cc99d0c9e4.tar.xz | |
testing/jailkit: simplify install files
| -rw-r--r-- | testing/jailkit/APKBUILD | 2 | ||||
| -rw-r--r-- | testing/jailkit/jailkit.post-deinstall | 11 | ||||
| -rw-r--r-- | testing/jailkit/jailkit.post-install | 12 |
3 files changed, 5 insertions, 20 deletions
diff --git a/testing/jailkit/APKBUILD b/testing/jailkit/APKBUILD index f3edc757aa..1dc8ae09cf 100644 --- a/testing/jailkit/APKBUILD +++ b/testing/jailkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=jailkit pkgver=2.15 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for chroot jailing a user or process." url="http://olivier.sessink.nl/jailkit" arch="all" diff --git a/testing/jailkit/jailkit.post-deinstall b/testing/jailkit/jailkit.post-deinstall index 1a6f5abb37..57669144d8 100644 --- a/testing/jailkit/jailkit.post-deinstall +++ b/testing/jailkit/jailkit.post-deinstall @@ -1,10 +1,3 @@ #!/bin/sh - -# test if the jk_chrootsh is already in /etc/shells -if test -w /etc/shells; then \ - if grep /usr/sbin/jk_chrootsh /etc/shells ; then \ - echo "commenting /usr/sbin/jk_chroots out of /etc/shells";\ - sed -i "s|^/usr/sbin/jk_chrootsh.*|#&|" /etc/shells ;\ - fi \ -fi - +remove-shell '/usr/sbin/jk_chroots' +exit 0 diff --git a/testing/jailkit/jailkit.post-install b/testing/jailkit/jailkit.post-install index 3476571882..88a592511a 100644 --- a/testing/jailkit/jailkit.post-install +++ b/testing/jailkit/jailkit.post-install @@ -1,11 +1,3 @@ #!/bin/sh - -# test if the jk_chrootsh is already in /etc/shells -# this previously had _at_echo but that fails on FreeBSD -if test -w /etc/shells; then \ - if ! grep /usr/sbin/jk_chrootsh /etc/shells ; then \ - echo "appending /usr/sbin/jk_chroots to /etc/shells";\ - echo /usr/sbin/jk_chrootsh >> /etc/shells ;\ - fi \ -fi - +add-shell '/usr/sbin/jk_chroots' +exit 0 |