Added /usr/bin/mksh to /etc/shells to prevent pkexec error; also added post_upgrade().

3 files changed, 10 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4340750b9e5b..c799b59a1f08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Thu Aug  3 21:13:23 UTC 2017
+# Sun Aug  6 15:52:35 UTC 2017
 pkgbase = mksh-git
-	pkgdesc = The MirBSD Korn Shell - an enhanced version of the public domain ksh, development version
+	pkgdesc = The MirBSD Korn Shell - an enhanced version of the public domain ksh (development version)
 	pkgver = 55.r3131.b903a5e
 	pkgrel = 1
 	url = https://www.mirbsd.org/mksh.htm
diff --git a/PKGBUILD b/PKGBUILD
index 8ede04e6e781..81eba6a7cf22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=mksh
 _pkgver=R55
 pkgver=55.r3131.b903a5e
 pkgrel=1
-pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh, development version'
+pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh (development version)'
 url='https://www.mirbsd.org/mksh.htm'
 license=('custom')
 arch=('i686' 'x86_64')
diff --git a/mksh.install b/mksh.install
index f096a2b66177..84bbedf435d3 100644
--- a/mksh.install
+++ b/mksh.install
@@ -1,9 +1,14 @@
 post_install() {
-  grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells
+  grep -x '/bin/mksh' /etc/shells 2>/dev/null || echo '/bin/mksh' >> /etc/shells
+  grep -x '/usr/bin/mksh' /etc/shells 2>/dev/null || echo '/usr/bin/mksh' >> /etc/shells
+}
+
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  sed -i "/^\/bin\/mksh$/d" /etc/shells
+  sed -i '/^(\/usr)?\/bin\/mksh$/d' /etc/shells
 }
 
 # vim:set ts=2 sw=2 et: