[X2Go-Commits] [x2goserver] 07/17: x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace historical "egrep" with "grep -E".

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit a48603d780a955b1de1e820db0d2c1e1f5804c4f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 16 03:02:46 2018 +0100

    x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace historical "egrep" with "grep -E".
---
 debian/changelog                                           | 2 ++
 x2goserver-desktopsharing/bin/x2goterminate-desktopsharing | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 18304d7..2f1c30c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
       not meant to be executed directly.
     - libx2go-server-db-perl/Makefile: make sure our {C,LD}FLAGS are always
       appended to the user-provided ones.
+    - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace
+      historical "egrep" with "grep -E".
   * x2goserver.spec:
     + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around
       a bug.
diff --git a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing
index 59735a0..93f332d 100755
--- a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing
+++ b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing
@@ -50,7 +50,7 @@ X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
 for process_id in `$PIDOF x2godesktopsharing`; do
 	env_of_process=$(cat -A /proc/$process_id/environ)
 	env_of_process=${env_of_process//^@/\\n}
-	display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2)
+	display=$(echo -e $env_of_process | grep -E "^DISPLAY=.*$" | cut -d"=" -f2)
 	if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then
 		kill -SIGTERM $process_id
 		exit 0

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