[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-9-g3b0fc54

[X2Go dev team]

The branch, master has been updated
       via  3b0fc54b49b2e3dc5617e4fc2ce7ddaa0c29faa4 (commit)
      from  077700a44d18794fce590395fbc4b84eb818f1f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b0fc54b49b2e3dc5617e4fc2ce7ddaa0c29faa4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Apr 29 14:40:44 2012 +0200

    Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 ++
 x2goserver/bin/x2goruncommand |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 37d81d0..c1a6c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
     - Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic
       desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets
       translated into an executable command by x2goruncommand.
+    - Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the
+      commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 6518685..310424a 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -69,7 +69,7 @@ if [ -e "/etc/lsb-release" ]; then
 fi
 
 # let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY)
-if [ "$cmd" == "GNOME" ]; then
+if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
 
 	# Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session.
 	# GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback.
@@ -79,7 +79,7 @@ if [ "$cmd" == "GNOME" ]; then
 	else
 		$cmd="/usr/bin/gnome-session"
 	fi
-elif [ "$cmd" == "UNITY" ] && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then
+elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity-2d-launcher" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then
 	$cmd="/usr/bin/gnome-session"
 
 elif [ "$cmd" == "KDE" ]; then


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).