[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-14-gea35506

[X2Go dev team]

The branch, master has been updated
       via  ea355064c9a388987117c8765501be55061e47c9 (commit)
      from  389c5d45a7b379904537016979b7232151484824 (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 ea355064c9a388987117c8765501be55061e47c9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 7 14:22:33 2012 +0200

    further consolidation of x2goruncommand, cross-tested on Debian wheezy/sid, sid still fails to launch GNOME3

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

Summary of changes:
 x2goserver/bin/x2goruncommand |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 50965f1..541326d 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -93,25 +93,25 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; 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"
+		args=" --session=$DESKTOP_SESSION"
 	elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then
 		export DESKTOP_SESSION="gnome-fallback"
-		args="--session=$DESKTOP_SESSION"
-	elif [ cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then
+		args=" --session=$DESKTOP_SESSION"
+	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
+	elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then
 		export DESKTOP_SESSION="gnome-fallback"
-		args="--session=$DESKTOP_SESSION"
+		args=" --session=$DESKTOP_SESSION"
 	fi
 
 elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
 	cmd="/usr/bin/gnome-session"
 	if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then
 		export DESKTOP_SESSION="ubuntu-2d"
-		args="--session=$DESKTOP_SESSION"
+		args=" --session=$DESKTOP_SESSION"
 	elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then
 		export DESKTOP_SESSION="2d-ubuntu"
-		args="--session=$DESKTOP_SESSION"
+		args=" --session=$DESKTOP_SESSION"
 	fi
 	# on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell
 
@@ -201,12 +201,12 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
 	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC"
 
 	x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && {
-		STARTUP="$cmd $args"
+		STARTUP="$cmd$args"
 		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
-		/etc/x2go/Xsession "$STARTUP"
+		STARTUP="$STARTUP" /etc/x2go/Xsession
 	} || {
-		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd $args\"..."
-		$cmd $args
+		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd$args\"..."
+		$cmd$args
 	}
 
 	#### some applications can quit immediately, we will wait here as long as x2goagent exists


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).