[X2Go-Commits] [x2goserver] 08/27: x2goserver/bin/x2gostartagent: some shells do not handle quotes in pattern substitutions gracefully.

[git-admin at x2go.org]

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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 6ae7c4f8435579c2856bb894d5061039ad83a1f4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 2 04:12:49 2018 +0100

    x2goserver/bin/x2gostartagent: some shells do not handle quotes in pattern substitutions gracefully.
    
    Remove them.
---
 debian/changelog              | 2 ++
 x2goserver/bin/x2gostartagent | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2ac8412..c661382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
       not impossible.
     - x2goserver/bin/x2gostartagent: replace perl call with bash pattern
       substitution.
+    - x2goserver/bin/x2gostartagent: some shells do not handle quotes in
+      pattern substitutions gracefully. Remove them.
   * x2goserver.spec:
     - RPMify x2goserver-xsession description.
     - Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 6781925..48e8ab6 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -491,7 +491,7 @@ fi
 NOLISTOPT=""
 if [ "${X2GOXDMCP}" == "" ] ;then
 	XDMCPOPT=""
-	if [ "x${X2GO_NXAGENT_OPTIONS}" != "x${X2GO_NXAGENT_OPTIONS/' -nolisten tcp'/''}" ]; then
+	if [ "x${X2GO_NXAGENT_OPTIONS}" != "x${X2GO_NXAGENT_OPTIONS/ -nolisten tcp/}" ]; then
 		NOLISTOPT="-nolisten tcp"
 	fi
 else

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