This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0ba07529fe93057bd85b903fd5b6b95630489930 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jan 2 03:30:15 2018 +0100 x2goserver/bin/x2gostartagent: make shellcheck happy by referencing "${SAVED_DISPLAY}" once. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2051d17..80d0a06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -278,6 +278,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium errors, use more quotes and curly braces. - x2goserver/bin/x2gostartagent: drop obsolete X2GO_BIN environment variable usage. + - x2goserver/bin/x2gostartagent: make shellcheck happy by referencing + "${SAVED_DISPLAY}" once. * 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 864ecf6..8205cd1 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -509,6 +509,10 @@ echo "${X2GO_HOST}:${X2GO_PORT}" >"${SESSION_DIR}/options" NX_AGENT=":${X2GO_PORT}" SAVED_DISPLAY="${DISPLAY}" + +# Make shellcheck happy. +: "${SAVED_DISPLAY}" + DISPLAY="nx/nx,options=${SESSION_DIR}/options:${X2GO_PORT}" export DISPLAY -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git