This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 7cc24afa5f9d95e9c6870fb4b9d910f7129c523b Author: Harald Nordgard-Hansen <hhansen@pvv.org> Date: Tue Jan 28 19:04:08 2014 +0100 Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that were badly quoted (which caused them to report the wrong result and to create a file called "=" in the user home directory). Aligning all tests to use the same style of quoting fixes this. (Fixes: #409). --- debian/changelog | 7 +++++++ x2goserver/bin/x2goruncommand | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef4aff8..409fd46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,13 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). + [ Harald Nordgard-Hansen ] + * New upstream release (4.0.1.14): + - Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that + were badly quoted (which caused them to report the wrong result and to + create a file called "=" in the user home directory). Aligning all tests + to use the same style of quoting fixes this. (Fixes: #409). + [ Orion Poplawski ] * New upstream release (4.0.1.14): - Fix wrong path to xinitrd.d in Xsession (section for RPM based distros). diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 73c23dc..fa0c04a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 12.10" | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.10" | bc)" == "1" -o "$(echo "$DISTRIB_RELEASE == 12.04" | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git