[arch-commits] Commit in mksh/trunk (PKGBUILD mksh.install)

[Eli Schwartz]

    Date: Thursday, May 17, 2018 @ 16:03:01
  Author: eschwartz
Revision: 323853

upgpkg: mksh 56.c-3

Fix FS#55053 - $SHELL not in /etc/shells breaks things

Modified:
  mksh/trunk/PKGBUILD
  mksh/trunk/mksh.install

--------------+
 PKGBUILD     |    2 +-
 mksh.install |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-17 14:51:22 UTC (rev 323852)
+++ PKGBUILD	2018-05-17 16:03:01 UTC (rev 323853)
@@ -5,7 +5,7 @@
 pkgname=mksh
 _pkgver=R56c
 pkgver=56.c
-pkgrel=2
+pkgrel=3
 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
 url='https://www.mirbsd.org/mksh.htm'
 license=('custom')

Modified: mksh.install
===================================================================
--- mksh.install	2018-05-17 14:51:22 UTC (rev 323852)
+++ mksh.install	2018-05-17 16:03:01 UTC (rev 323853)
@@ -1,9 +1,14 @@
 post_install() {
-  grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells
+  grep -qx /bin/mksh /etc/shells || echo /bin/mksh >>/etc/shells
+  grep -qx /usr/bin/mksh /etc/shells || echo /usr/bin/mksh >>/etc/shells
 }
 
+post_upgrade() {
+  post_install
+}
+
 post_remove() {
-  sed -i "/^\/bin\/mksh$/d" /etc/shells
+  sed -i -r '/^(\/usr)?\/bin\/mksh$/d' etc/shells
 }
 
 # vim:set ts=2 sw=2 et: