[X2Go-Commits] [x2goserver] 01/01: No Bashisms in scriptlets.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 29 20:56:42 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit cbf52f7c090ac028705222da72a406afbde27e24
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jan 29 19:51:18 2015 +0100
No Bashisms in scriptlets.
Conflicts (resolved by Mike Gabriel):
x2goserver.spec
---
debian/changelog | 1 +
x2goserver.spec | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ad97cd..24e626f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
+ Create system user x2gouser with $HOME in /var/lib/x2go. (Fixes: #697).
+ Always set BuildRoot: parameter.
+ BuildRequires: SUSE <= 11.3 has xorg-x11, xinit.
+ + No Bashisms in scriptlets.
[ Matthew L. Dailey ]
* New upstream version (4.0.1.19):
diff --git a/x2goserver.spec b/x2goserver.spec
index 4e331f8..8387a66 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -339,8 +339,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop
%pre
-getent group x2gouser >/dev/null || groupadd -r x2gouser
-getent passwd x2gouser >/dev/null || \
+getent group x2gouser 1>/dev/null || groupadd -r x2gouser
+getent passwd x2gouser 1>/dev/null || \
useradd -r -g x2gouser -d %{_localstatedir}/lib/x2go -s /sbin/nologin \
-c "x2go" x2gouser
exit 0
@@ -353,8 +353,8 @@ exit 0
# Initialize the session database
if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then
if [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ]; then
- if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1; then
- %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
+ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>&1; then
+ %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>&1 || :
fi
fi
fi
@@ -389,16 +389,16 @@ fi
%endif
%else
/sbin/chkconfig --add x2goserver
-/sbin/service x2goserver condrestart >/dev/null 2>&1 || :
+/sbin/service x2goserver condrestart 1>/dev/null 2>&1 || :
%postun
if [ "$1" -ge "1" ] ; then
- /sbin/service x2goserver condrestart >/dev/null 2>&1 || :
+ /sbin/service x2goserver condrestart 1>/dev/null 2>&1 || :
fi
%preun
if [ "$1" = 0 ]; then
- /sbin/service x2goserver stop >/dev/null 2>&1
+ /sbin/service x2goserver stop 1>/dev/null 2>&1
/sbin/chkconfig --del x2goserver
fi
%endif
@@ -411,18 +411,18 @@ fi
%post fmbindings
-/usr/bin/update-mime-database /usr/share/mime &>/dev/null || :
-/usr/bin/update-desktop-database &>/dev/null || :
+/usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null|| :
+/usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
%postun fmbindings
if [ $1 -eq 0 ] ; then
- /usr/bin/update-mime-database /usr/share/mime &>/dev/null || :
- /usr/bin/update-desktop-database &>/dev/null || :
+ /usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null || :
+ /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
fi
%pre printing
-getent group x2goprint >/dev/null || groupadd -r x2goprint
-getent passwd x2goprint >/dev/null || \
+getent group x2goprint 1>/dev/null || groupadd -r x2goprint
+getent passwd x2goprint 1>/dev/null || \
useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \
-c "x2go" x2goprint
exit 0
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list