[X2Go-Commits] [x2goserver] 04/17: debian/libx2go-server-db-perl.postinst: replace historical "egrep" with "grep -E".

git-admin at x2go.org git-admin at x2go.org
Fri Nov 16 03:47:04 CET 2018


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 680e3abcf9134c1e5555619bd5b2b00f7331d901
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 16 02:57:51 2018 +0100

    debian/libx2go-server-db-perl.postinst: replace historical "egrep" with "grep -E".
---
 debian/changelog                       | 2 ++
 debian/libx2go-server-db-perl.postinst | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b2a7ef0..28becbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
     + More curly braces, quotes etc.
   * debian/x2goserver-desktopsharing.postrm:
     + More curly braces, quotes etc.
+  * debian/libx2go-server-db-perl.postinst:
+    + Replace historical "egrep" with "grep -E".
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 14 Aug 2018 16:41:40 +0200
 
diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst
index 13bf0c5..c3425c0 100755
--- a/debian/libx2go-server-db-perl.postinst
+++ b/debian/libx2go-server-db-perl.postinst
@@ -38,7 +38,7 @@ case "${1}" in
 		# It will only succeed if both packages are installed. As we cannot influence the
 		# installation order, we handle the session DB creation in both packages. One of
 		# them should succeed.
-		if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && egrep '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then
+		if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && grep -E '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then
 			if [ ! -f '/var/lib/x2go/x2go_sessions' ]; then
 				x2godbadmin --createdb
 			else

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list