[X2Go-Commits] [x2goserver] 01/01: Make x2goruncommand aware of the LXQt desktop shell.
git-admin at x2go.org
git-admin at x2go.org
Tue Aug 29 14:56:15 CEST 2017
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 b27490fd84f9e400ab6021f5926bca358b584595
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Aug 29 14:55:41 2017 +0200
Make x2goruncommand aware of the LXQt desktop shell.
---
debian/changelog | 1 +
x2goserver/bin/x2goruncommand | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index cf21c0f..61051c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
* New upstream version (4.0.1.21):
- x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using
Arctica's nx-libs and its new Xinerama feature. Fixes: #1153.
+ - Make x2goruncommand aware of the LXQt desktop shell.
-- X2Go Release Manager <git-admin at x2go.org> Sun, 20 Nov 2016 12:54:13 +0100
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 34c8479..f807375 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -68,7 +68,6 @@ if [ -S "$SSH_AUTH_SOCK" ]; then
fi
export SSH_AUTH_SOCK="$X2GOSSH_AUTH_SOCK"
-
if ! x2gofeature X2GOAGENT_RANDRXINERAMA 1>/dev/null; then
NX_XINERAMA_LIBS="$(x2gopath xinerama)"
NX_LIBS="$(x2gopath nx-x11)"
@@ -196,6 +195,8 @@ elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then
cmd="/usr/bin/xfce4-session"
elif [ "$cmd" == "LXDE" ]; then
cmd="/usr/bin/startlxde"
+elif [ "$cmd" == "LXQt" ]; then
+ cmd="/usr/bin/startlxqt"
elif [ "$cmd" == "TRINITY" ]; then
# If we are on Q4OS, we needs to set env and run some tasks before
# launching trinity.
--
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