This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from f4b29ea x2goserver/bin/x2gostartagent: support disabling or enabling RANDR Xinerama in x2goagent via any parameter in the form randr_xinerama=value (with value interpreted by x2goistrue). new fc416d6 x2goserver/bin/x2gostartagent: pass in xinerama configuration value via environment. new 244eab1 x2goserver/bin/x2gostartagent: add FIXME entry for the SHADREQ_USER optional parameter. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ x2goserver/bin/x2gostartagent | 21 +++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit fc416d6f254cb94de7942b47f0a920158ef79db6 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 07:01:00 2018 +0100 x2goserver/bin/x2gostartagent: pass in xinerama configuration value via environment. Doing it via an argument is just asking for trouble since we actually have optional parameters. --- debian/changelog | 3 +++ x2goserver/bin/x2gostartagent | 18 ++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36d871d..28bfd44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -210,6 +210,9 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low (with value interpreted by x2goistrue). Note that it is not possible to change the RRXinerama preference after a session has been started currently. + - x2goserver/bin/x2gostartagent: pass in xinerama configuration value via + environment. Doing it via an argument is just asking for trouble since + we actually have optional parameters. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c285f06..d9a2a45 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -115,18 +115,12 @@ fi typeset -i x2go_randr_xinerama='1' -# Extending optional parameters isn't trivially possible, but -# we want this script to work with newer X2Go Client versions -# that supply a Xinerama configuration value and with older -# ones that do not. -# Since we already have trailing optional arguments (for -# the desktop sharing functionality), go ahead and scan -# all arguments for the required value. -typeset item='' -for item in "${@}"; do - typeset tmp_regex='^randr_xinerama=(.*)$' - [[ "${item}" =~ ${tmp_regex} ]] && x2go_randr_xinerama="$("${X2GO_LIB_PATH}/x2goistrue" "${BASH_REMATCH[1]}")" -done +# Extending optional parameters isn't trivially possible. +# Since we want this script to work with newer X2Go Client +# versions that supply a Xinerama configuration value and +# also with older ones that do not, we pass it in as an +# environment variable. +[[ -n "${X2GO_RANDR_XINERAMA}" ]] && x2go_randr_xinerama="$("${X2GO_LIB_PATH}/x2goistrue" "${X2GO_RANDR_XINERAMA}")" X2GO_GEOMETRY="${1}"; shift X2GO_LINK="${1}"; shift -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 244eab1534e37be3bab4e70636cc03e00eddd80b Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 07:03:48 2018 +0100 x2goserver/bin/x2gostartagent: add FIXME entry for the SHADREQ_USER optional parameter. No client actually uses it and it makes the whole parameter handling fragile. --- debian/changelog | 3 +++ x2goserver/bin/x2gostartagent | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28bfd44..81eb62e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -213,6 +213,9 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low - x2goserver/bin/x2gostartagent: pass in xinerama configuration value via environment. Doing it via an argument is just asking for trouble since we actually have optional parameters. + - x2goserver/bin/x2gostartagent: add FIXME entry for the SHADREQ_USER + optional parameter. No client actually uses it and it makes the whole + parameter handling fragile. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index d9a2a45..941627c 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -145,6 +145,9 @@ if [[ "${X2GO_STYPE}" = 'S' ]]; then SHADOW_USER="$(awk '{split($0,a,"XSHAD"); print a[2]}' <<< "${X2GO_CMD}")" SHADOW_DESKTOP="$(awk '{split($0,a,"XSHAD"); print a[3]}' <<< "${X2GO_CMD}")" + # FIXME: no client application actually passes in an additional user name. + # This is most likely redundant and confuses things (esp. since it's an + # optional parameter) needlessly. if [[ -z "${1}" ]]; then # can this line be removed? -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org