Subject: [alpine-aports] [PATCH] testing/jailkit: simplify removal of jk_chrootsh

From: Sören Tempel <[email-masked]>
Date: Sat, 8 Aug 2015 12:19:16 +0200

---
 testing/jailkit/APKBUILD               |  2 +-
 testing/jailkit/jailkit.post-deinstall | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/testing/jailkit/APKBUILD b/testing/jailkit/APKBUILD
index f3edc75..1dc8ae0 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 1a6f5ab..5766914 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
-- 
2.5.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Sören Tempel <[email-masked]>
Date: Sat, 8 Aug 2015 12:22:41 +0200

---
 testing/jailkit/APKBUILD               |  2 +-
 testing/jailkit/jailkit.post-deinstall | 11 ++---------
 testing/jailkit/jailkit.post-install   | 12 ++----------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/testing/jailkit/APKBUILD b/testing/jailkit/APKBUILD
index f3edc75..1dc8ae0 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 1a6f5ab..5766914 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 3476571..88a5925 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
-- 
2.5.0

---