[X2Go-Commits] [x2goserver] 01/01: Use if then clauses for creating user/group x2goprint.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 18e36fc217be07487f30f9c41f76700d7e6dc90e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 9 14:02:29 2015 +0100

    Use if then clauses for creating user/group x2goprint.
---
 debian/changelog |    3 ++-
 x2goserver.spec  |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b440a13..e7458fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -274,7 +274,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + "%set_permissions" / "%verify_permissions" macros are not know in SLE <=
       11.3. Using "%run permissions" and "%verify permissions" instead.
     + On SUSE, add permissions.d/x2goserver.
-    + Fix SQLite wrapper permissions (02775 -> 02755).
+    + Fix SQLite wrapper permissions (02775 -> 02755)
+    + Use if then clauses for creating user/group x2goprint.
 
   [ Matthew L. Dailey ]
   * New upstream version (4.0.1.19):
diff --git a/x2goserver.spec b/x2goserver.spec
index b59304d..9651bce 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -572,11 +572,13 @@ fi
 
 
 %pre printing
-getent group x2goprint 1>/dev/null || groupadd -r x2goprint
-getent passwd x2goprint 1>/dev/null || \
+if ! getent group x2goprint 1>/dev/null; then
+    groupadd -r x2goprint
+fi
+if ! getent passwd x2goprint 1>/dev/null; then
     useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \
-    -c "x2go" x2goprint
-
+            -c "x2go" x2goprint
+fi
 
 %files
 %defattr(-,root,root)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git