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

[Massimiliano Torromeo]

    Date: Thursday, March 13, 2014 @ 09:49:24
  Author: mtorromeo
Revision: 107140

upgpkg: openfire 3.9.1-2

Create user/group with system ids

Modified:
  openfire/trunk/PKGBUILD
  openfire/trunk/openfire.install

------------------+
 PKGBUILD         |    5 +----
 openfire.install |   14 +++++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-13 07:55:36 UTC (rev 107139)
+++ PKGBUILD	2014-03-13 08:49:24 UTC (rev 107140)
@@ -4,7 +4,7 @@
 
 pkgname=openfire
 pkgver=3.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High performance XMPP (Jabber) server."
 arch=('any')
 url='http://www.igniterealtime.org/projects/openfire/'
@@ -48,9 +48,6 @@
 	cp -R lib "$pkgdir/usr/lib/openfire"
 }
 
-sha256sums=('6d9593cd5ad2190166baed6cca46ed41f21762f257b195697057f85d8391207f'
-            'c8a612abee90bdc9a2869e562a4bbbf596159c60adcd23368833a0e2ca27c1d4'
-            '772332b66a90935ddb8075eb10eab9b95a84caa45908bb3fa5861d7fa148399c')
 sha256sums=('682576ea16a111374735cf93bd5e444feee6d0b714b109436aa7e0c775f3020d'
             'c8a612abee90bdc9a2869e562a4bbbf596159c60adcd23368833a0e2ca27c1d4'
             '772332b66a90935ddb8075eb10eab9b95a84caa45908bb3fa5861d7fa148399c')

Modified: openfire.install
===================================================================
--- openfire.install	2014-03-13 07:55:36 UTC (rev 107139)
+++ openfire.install	2014-03-13 08:49:24 UTC (rev 107140)
@@ -1,12 +1,8 @@
 post_install() {
-  if [ ! `grep openfire /etc/group` ]; then
-    groupadd openfire &>/dev/null;
-  fi
+  getent group openfire >/dev/null 2>&1 || groupadd -r openfire &>/dev/null;
+  getent passwd openfire >/dev/null 2>&1 || useradd -rg openfire -d /usr/share/openfire -s /bin/false openfire &>/dev/null
 
-  id openfire &>/dev/null || \
-    useradd -g openfire -d /usr/share/openfire -s /bin/false openfire
-
-  chown -R openfire:openfire /var/log/openfire /usr/share/openfire /etc/openfire
+  chown -R openfire:openfire var/log/openfire usr/share/openfire etc/openfire
 }
 
 post_upgrade() {
@@ -14,6 +10,6 @@
 }
 
 pre_remove() {
-  userdel openfire &> /dev/null
-  groupdel openfire &> /dev/null
+  getent passwd openfire >/dev/null 2>&1 && userdel openfire &> /dev/null
+  getent group openfire >/dev/null 2>&1 && groupdel openfire &> /dev/null
 }