This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 1f7fe29bb3609326aa072615d784654a07a011b0 Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Sat Jan 23 04:54:01 2016 +0100 x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in order from newest to oldest. Fixes: #985. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 5 +++++ x2goserver/bin/x2goruncommand | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48e905a..c6f5422 100644 --- a/debian/changelog +++ b/debian/changelog @@ -277,6 +277,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/bin/x2gostartagent: original patch for SSH_PORT randomization/IP-based initialization. Submitted as #922. + [ Stefan Baur ] + * New upstream version (4.0.1.20): + - x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in + order from newest to oldest. Fixes: #985. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 290cfa6..43b4064 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -200,7 +200,21 @@ elif [ "$cmd" == "TRINITY" ]; then if [ -e /usr/bin/start-q4os-x2go ]; then cmd="/usr/bin/start-q4os-x2go" else - cmd="/usr/bin/starttrinity" + # Multiple trinity launchers exist in practice, this list + # is sorted from newest to oldest. + + # Note: the /opt/trinity prefix might look weird, but this is + # actually the location Debian installs trinity to. The reason + # seems to be that otherwise trinity clashes with KDE3. + # It's entirely possible that this situation changes again + # once KDE3 has been completely removed. + if [ -x "/opt/trinity/bin/starttde" ]; then + cmd="/opt/trinity/bin/starttde" + elif [ -x "/opt/trinity/bin/starttrinity" ]; then + cmd="/opt/trinity/bin/starttrinity" + else + cmd="/usr/bin/starttrinity" + fi fi elif [ "$cmd" == "OPENBOX" ]; then cmd="/usr/bin/openbox-session" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git