[X2Go-Commits] [x2goserver] 01/01: TRINITY: Add support for Q4OS
git-admin at x2go.org
git-admin at x2go.org
Fri May 29 14:18:10 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 9ec47ce0dfe7a9d4895dd0a6c8f2412603ff3b60
Author: Mike DePaulo <mikedep333 at gmail.com>
Date: Fri May 29 08:16:58 2015 -0400
TRINITY: Add support for Q4OS
---
debian/changelog | 1 +
x2goserver/bin/x2goruncommand | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b0991b1..b62fe53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -173,6 +173,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.1.20):
- TERMINAL Session: Add support for qterminal
(Lightweight terminal emulator written in Qt)
+ - TRINITY: Add support for Q4OS
[ Mihai Moldovan ]
* New upstream version (4.0.1.20):
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index ac7ff7f..fa62f71 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -195,7 +195,13 @@ elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then
elif [ "$cmd" == "LXDE" ]; then
cmd="/usr/bin/startlxde"
elif [ "$cmd" == "TRINITY" ]; then
- cmd="/usr/bin/starttrinity"
+ # If we are on Q4OS, which needs to set env and run some tasks before
+ # launching trinity.
+ if [ -e /usr/bin/start-q4os-x2go ]; then
+ cmd="/usr/bin/start-q4os-x2go"
+ else
+ cmd="/usr/bin/starttrinity"
+ fi
elif [ "$cmd" == "OPENBOX" ]; then
cmd="/usr/bin/openbox-session"
elif [ "$cmd" == "ICEWM" ]; then
--
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