This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from dedc6aa x2goserver-x2goagent/etc/x2goagent.options: disable BIG-REQUESTS; leads to a lot of weird crashes and is currently not implemented correctly in nxagent. Fixes: #1266. new e833dd1 x2goserver/bin/x2gostartagent: fix calculation syntax errors, drop useless subshells, don't use -o operator in plain test calls. The 1 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 | 2 ++ x2goserver/bin/x2goruncommand | 8 ++++---- 2 files changed, 6 insertions(+), 4 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 e833dd10e632e06d3382e079f2764aac0c1f1389 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 03:53:59 2018 +0100 x2goserver/bin/x2gostartagent: fix calculation syntax errors, drop useless subshells, don't use -o operator in plain test calls. --- debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 419601a..9f99fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -114,6 +114,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - x2goserver-x2goagent/etc/x2goagent.options: disable BIG-REQUESTS; leads to a lot of weird crashes and is currently not implemented correctly in nxagent. Fixes: #1266. + - x2goserver/bin/x2gostartagent: fix calculation syntax errors, drop + useless subshells, don't use -o operator in plain test calls. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b2afd45..2d8f23e 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -160,7 +160,7 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then # Yes, "Unity" is in the actual string. Observed on Ubuntu 16.04 export XDG_CURRENT_DESKTOP="GNOME-Flashback:Unity" args=" --session=$DESKTOP_SESSION --disable-acceleration-check" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE = 14.04" | bc)" == "1" -o "$(echo "$DISTRIB_RELEASE = 14.10" | bc)" == "1" ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && { [ "$(echo "$DISTRIB_RELEASE == 14.04" | bc)" == "1" ] || [ "$(echo "$DISTRIB_RELEASE == 14.10" | bc)" == "1" ]; }; then export DESKTOP_SESSION="gnome-flashback" if [ -z "$GTK_MODULES" ] ; then export GTK_MODULES="unity-gtk-module" @@ -198,12 +198,12 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then export DESKTOP_SESSION="gnome" fi -elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then +elif [ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]; then cmd="/usr/bin/gnome-session" 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" ] || [ "$(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 @@ -212,7 +212,7 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then fi # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell -elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then +elif [ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]; then # Cinnamon 2.0 and newer # The cmd is a script that calls the "cinnamon-session" binary. if [ -e /usr/bin/cinnamon-session-cinnamon2d ]; then -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org