This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit abbb86a63c6f260420bd1b962c7d9ef1d0642525 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Aug 4 17:03:12 2021 +0200 x2goserver/bin/x2goresume-session: fix redirections and make script workable again. Shells do not like redirections like 'filedes'>'file' and interpret 'filedes' as an argument to the program instead of as a file descriptor to be used for the redirection, even though 'filedes' might be something like '2'. --- debian/changelog | 5 +++++ x2goserver/bin/x2goresume-session | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91bc6a36..8c684b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -409,6 +409,11 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium previous commit. - x2goserver/bin/x2goresume-session: simplify where possible, use x2gooptionsstring instead of awk field splitting hackery. + - x2goserver/bin/x2goresume-session: fix redirections and make script + workable again. Shells do not like redirections like 'filedes'>'file' + and interpret 'filedes' as an argument to the program instead of as a + file descriptor to be used for the redirection, even though 'filedes' + might be something like '2'. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 6de83c8a..8a761780 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -263,7 +263,7 @@ typeset agent_options_base64="$(base64 -w '0' < "${session_dir}/options")" # so keep it like that. typeset has_xinerama="$(x2gooptionsstring -e -c -b -- "${agent_options_base64}" \ "$(printf '%s' 'xinerama' | base64 -w '0')" \ - '2'>'/dev/null')" + 2>'/dev/null')" if [ -z "${has_xinerama}" ]; then has_xinerama='0' else @@ -302,18 +302,18 @@ new_agent_options_base64="$(x2gooptionsstring -t -c -b -- "${agent_options_base6 "$(printf 'listen=%s' "${gr_port}" | base64 -w '0')" \ "$(printf 'fullscreen=%s' "${fullscreen_val}" | base64 -w '0')" \ "$(printf 'clipboard=%s' "${clipboard}" | base64 -w '0')" \ - '2'>'/dev/null')" + 2>'/dev/null')" if [ '1' -eq "${has_xinerama}" ]; then new_agent_options_base64="$(x2gooptionsstring -t -c -b -- "${new_agent_options_base64}" \ "$(printf 'xinerama=%s' "${xinerama_option}" | base64 -w '0')" \ - '2'>'/dev/null')" + 2>'/dev/null')" fi if [[ -z "${geometry_val}" ]] || [[ "${geometry_val}" = 'fullscreen' ]]; then new_agent_options_base64="$(x2gooptionsstring -t -c -b -- "${new_agent_options_base64}" \ "$(printf '-geometry' | base64 -w '0')" \ - '2'>'/dev/null')" + 2>'/dev/null')" fi typeset x2go_client="$(awk '{print $1}' <<< "${SSH_CLIENT}")" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git