This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 27382e83826c2dd75c34a954545b06444354a622 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:33:59 2018 +0100 x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98f889a..31c83a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep -E". - x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. + - x2goserver/bin/x2goruncommand: 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/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2d8f23e..b55aa97 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -194,7 +194,7 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then args=" --session=$DESKTOP_SESSION" elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome" - elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then + elif grep -E '^(squeeze|6\.).*' '/etc/debian_version' >'/dev/null'; then export DESKTOP_SESSION="gnome" fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git