[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-87-gc264271

[X2Go dev team]

The branch, master has been updated
       via  c264271c18a8ae0ecd4babd9b42c17c518663377 (commit)
      from  332da03197966d147000dd946f23e77f30f6b62f (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 c264271c18a8ae0ecd4babd9b42c17c518663377
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 12 10:03:35 2012 +0100

    Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number and by using the bc command for comparing versions.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e62acbb..0f321b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low
   * New upstream release (3.1.1.7):
     - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch
       command.
+    - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number
+      and by using the bc command for comparing versions.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Nov 2012 09:28:32 +0100
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 3d71736..0724ca8 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -91,14 +91,14 @@ fi
 if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
 
 	cmd="/usr/bin/gnome-session"
-	if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^[a-m].*" >/dev/null; then
-		export DESKTOP_SESSION="gnome"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^n.*" >/dev/null; then
-		export DESKTOP_SESSION="2d-gnome"
-		args=" --session=$DESKTOP_SESSION"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then
+	if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 11.10 | bc); then
 		export DESKTOP_SESSION="gnome-fallback"
 		args=" --session=$DESKTOP_SESSION"
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then
+		export DESKTOP_SESSION="2d-gnome"
+		args=" --session=$DESKTOP_SESSION"
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE <= 10.10 | bc); then
+		export DESKTOP_SESSION="gnome"
 	elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then
 		export DESKTOP_SESSION="gnome"
 	elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; 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).