[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: More scriptlet fixes.
git-admin at x2go.org
git-admin at x2go.org
Mon Oct 13 16:50:42 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 447842edd5c17726284995655ca6c24d2b637d37
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Oct 13 16:50:39 2014 +0200
x2goserver.spec: More scriptlet fixes.
---
x2goserver.spec | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/x2goserver.spec b/x2goserver.spec
index 55b4186..2a84916 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -350,12 +350,16 @@ exit 0
%post
# Initialize the session database
-[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
- [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ] &&
- egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
+[ ! -s %{_sharedstatedir}/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 %{_sharedstatedir}/x2go/x2go_sessions ] && %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null; }
+egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && { \
+ [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && \
+ %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || \
+ %{_sbindir}/x2godbadmin --updatedb 1>/dev/null 2>/dev/null; \
+}
%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_post x2goserver.service
@@ -384,10 +388,10 @@ fi
%post -n perl-X2Go-Server-DB
# Initialize the session database
-[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
- [ -x %{_sbindir}/x2godbadmin ] &&
- egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
- %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 ||
+[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && \
+ [ -x %{_sbindir}/x2godbadmin ] && \
+ egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 && \
+ %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
%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
More information about the x2go-commits
mailing list