[X2Go-Commits] [x2goserver] 10/17: x2goserver-extensions/bin/x2goserver-run-extensions: replace historical "egrep" with "grep -E".

git-admin at x2go.org git-admin at x2go.org
Fri Nov 16 03:47:05 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 80349bd3438ecf22549bca7e70353252a40ca47b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 16 03:12:16 2018 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 5da383f..fb4c1fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
       negative exit codes.
     - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: more curly
       braces, quotes etc.
+    - x2goserver-extensions/bin/x2goserver-run-extensions: 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-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index 9a56bcc..8807173 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -32,7 +32,7 @@ X2GO_SESSION="$1"
 X2GO_MODALITY="$2"
 
 # scan extensions and execute them
-find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
+find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | grep -E "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
 	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION"
 	$x2go_extension "$X2GO_SESSION" &>/dev/null && {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully"

--
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