[X2Go-Commits] [x2goserver] 01/01: Replace historical "egrep" with "grep -E".
git-admin at x2go.org
git-admin at x2go.org
Mon Oct 13 20:53:37 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 603028b2b99de7256eadca34457c58599c03c87b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Oct 13 20:52:15 2014 +0200
Replace historical "egrep" with "grep -E".
---
debian/changelog | 1 +
x2goserver.spec | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 81e6292..7cedda6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -165,6 +165,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
+ Use %{_localstatedir} instead of %{_sharedstatedir}.
+ Use proper if... then... clauses.
+ For SUSE builds: Add to R: shadow (useradd, groupadd).
+ + Replace historical "egrep" with "grep -E".
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200
diff --git a/x2goserver.spec b/x2goserver.spec
index 9ec6dae..879af01 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -353,13 +353,13 @@ exit 0
# Initialize the session database
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
+ if grep -E "^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 grep -E "^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 || :
@@ -395,7 +395,7 @@ fi
# Initialize the session database
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
+ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1; then
%{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
fi
fi
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list