[X2Go-Commits] [x2goserver] 02/02: x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in order from newest to oldest. Fixes: #985.

git-admin at x2go.org git-admin at x2go.org
Sat Jan 23 04:55:53 CET 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 203d95e0fa7acf97232745c70756559f5dc3690e
Author: Stefan Baur <X2Go-ML-1 at 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.
---
 debian/changelog              |    5 +++++
 x2goserver/bin/x2goruncommand |   16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0666110..f87c694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,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 at 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


More information about the x2go-commits mailing list