This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 70d15b3e8ab7ff4cfc70766502e3156c1977931e Author: Mihai Moldovan <ionic@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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b0770d8..2a280e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -293,6 +293,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 8e6542b..d980975 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -526,7 +526,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