This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 64b5f462e4ee93b1c93abd4e7d44d4799b6005f1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 17:30:47 2014 +0200 Use proper if... then... clauses. --- debian/changelog | 1 + x2goserver.spec | 32 +++++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1dd429c..9e943a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -163,6 +163,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). + No %{_sysconfdir}/x2go/Xclients.d on SUSE systems. + Use %{_localstatedir} instead of %{_sharedstatedir}. + + Use proper if... then... clauses. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 01ff9de..6403ed6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -350,15 +350,18 @@ exit 0 %post # Initialize the session database -[ ! -s %{_localstatedir}/x2go/x2go_sessions ] && \ - [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ] && \ - egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && \ - %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : - -egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && { \ - [ ! -s %{_localstatedir}/x2go/x2go_sessions ] && \ - %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || \ - %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null; \ +if [ ! -s %{_localstatedir}/x2go/x2go_sessions ]; then + if [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ]; then + if egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1; then + %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : + fi + fi +fi + +if egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; then + if [ ! -s %{_localstatedir}/x2go/x2go_sessions ]; then + %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : + %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null || : } %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -388,10 +391,13 @@ fi %post -n perl-X2Go-Server-DB # Initialize the session database -[ ! -s %{_localstatedir}/x2go/x2go_sessions ] && \ - [ -x %{_sbindir}/x2godbadmin ] && \ - egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && \ - %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : +if [ ! -s %{_localstatedir}/x2go/x2go_sessions ]; then + if [ -x %{_sbindir}/x2godbadmin ]; then + if egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1; then + %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || : + fi + fi +fi %post fmbindings /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git