[X2Go-Commits] [x2goserver] 02/05: x2goserver/bin/x2gostartagent: fix quoting.

git-admin at x2go.org git-admin at x2go.org
Sun Jun 16 21:47:16 CEST 2019


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

x2go pushed a commit to branch master
in repository x2goserver.

commit fc8933912e245d7f328456e2f1d0557234ea2a9a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 16 21:33:15 2019 +0200

    x2goserver/bin/x2gostartagent: fix quoting.
---
 debian/changelog              | 1 +
 x2goserver/bin/x2gostartagent | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d12c16e..e126196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,6 +82,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     - x2goserver/Makefile: install man1 files and dirs, too.
     - x2goserver/bin/x2goruncommand: fix typo in IceWM branch.
     - X2Go_in_progress_do_not_use/Server/DB/MySQL.pm: backport kdrive change.
+    - x2goserver/bin/x2gostartagent: fix quoting.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 0c7cd2e..565b4bd 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -211,7 +211,7 @@ COLORDEPTH="$(awk '{split($0,a,"-depth_"); print a[2]}' <<< "${X2GO_TYPE}")"
 SESSION_TYPE='D'
 NOEXITPARAM=''
 
-AGENTBIN=x2goagent
+AGENTBIN='x2goagent'
 
 if [[ "${X2GO_STYPE}" = 'R' ]]; then
 	SESSION_TYPE='R'
@@ -469,7 +469,7 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then
 else
 	# set NX_TEMP to /tmp, make sure agent starts when pam_tmpdir.so is in use
 	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "started nxagent: NX_TEMP=/tmp x2goagent X2GO_NXAGENT_OPTIONS ('${X2GO_NXAGENT_OPTIONS}') NOLISTOPT ('${NOLISTOPT}') X2GODPIOPTION_ ('${X2GODPIOPTION_}') XDMCPPOPT ('${XDMCPOPT}') -SESSION_TYPE ('-${SESSION_TYPE}') NOEXITPARAM ('${NOEXITPARAM}') -auth \"XAUTHORITY\" ('\"${XAUTHORITY}\"') agent_geometry ('${agent_geometry}') -name \"SESSION_WINDOW_TITLE\" ('\"${SESSION_WINDOW_TITLE}\"') \"NX_AGENT\" ('\"${NX_AGENT}\"') 2>\"SESSION_LOG\" ('\"${ [...]
-	NX_TEMP='/tmp' ${AGENTBIN} ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
+	NX_TEMP='/tmp' "${AGENTBIN}" ${X2GO_NXAGENT_OPTIONS} ${NOLISTOPT} ${X2GODPIOPTION_} ${XDMCPOPT} -${SESSION_TYPE} ${NOEXITPARAM} -auth "${XAUTHORITY}" ${agent_geometry} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
 fi
 
 ln -s -- "${SESSION_DIR}" "${X2GO_ROOT}/C-${SESSION_NAME}"

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