The branch, master has been updated via 077700a44d18794fce590395fbc4b84eb818f1f4 (commit) from c13ffe1cb2c39edfacab52bc62e278469da19c9e (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 077700a44d18794fce590395fbc4b84eb818f1f4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Apr 29 14:20:42 2012 +0200 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. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2goserver/bin/x2goruncommand | 29 ++++++++++++++++++++ x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 3 files changed, 33 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bca28f0..37d81d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Avoid error messages in x2gocmdexistmessage if cmdoutput file could not be found. - Provide nx-X11 libraries for applications launched via x2goruncommand. + - 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index a6addbf..6518685 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -63,6 +63,35 @@ elif [ "$sndsys" == "arts" ]; then export ARTS_SERVER=localhost:$4 fi +# detect Ubuntu version via /etc/lsb-release (not supported by Debian) +if [ -e "/etc/lsb-release" ]; then + source /etc/lsb-release +fi + +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) +if [ "$cmd" == "GNOME" ]; then + + # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session. + # GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback. + + if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then + $cmd="/usr/bin/gnome-session-fallback" + else + $cmd="/usr/bin/gnome-session" + fi +elif [ "$cmd" == "UNITY" ] && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then + $cmd="/usr/bin/gnome-session" + +elif [ "$cmd" == "KDE" ]; then + $cmd="/usr/bin/startkde" +elif [ "$cmd" == "XFCE4" ]; then + $cmd="/usr/bin/xfce4-session" +elif [ "$cmd" == "LXDE" ]; then + $cmd="/usr/bin/startlxde" +elif [ "$cmd" == "TRINITY" ]; then + $cmd="/usr/bin/starttrinity" +fi + if [ "$cmd" == "WWWBROWSER" ]; then if [ -e "/usr/bin/firefox" ]; then cmd="/usr/bin/firefox" diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 70313d2..a5dd741 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -34,6 +34,7 @@ case "$X2GO_FEATURE" in "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;; "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; + "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; *) exit -1;; esac 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).