The branch, master has been updated via 3180bf56e351ba89d33824fbf31be57c4f1f3e93 (commit) via 5ca4d96cb3f5788dc631a7b4d512fa5cd40bcb82 (commit) from 1baf675e4dd77d98c598df7f4a9c80fa47a620db (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 3180bf56e351ba89d33824fbf31be57c4f1f3e93 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 15 22:01:05 2011 +0200 remove redundant which call in x2goruncommand commit 5ca4d96cb3f5788dc631a7b4d512fa5cd40bcb82 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 15 22:00:37 2011 +0200 Fix for TERMINAL command execution if konsole (KDE4) is installed on the server (closes upstream issue #87) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05870f1..db55b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add chromium-browser as possible WWWBROWSER to x2goruncommand. * Add lxterminal as possible TERMINAL to x2goruncommand. * Add LibreOffice.org as possible OFFICE application to x2goruncommand. + * Fix for TERMINAL command execution if konsole (KDE4) is installed on the + server (closes upstream issue #87) [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 42156b9..50dcff7 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -85,6 +85,8 @@ if [ "$cmd" == "TERMINAL" ]; then IMEXIT="true" if [ -e "/usr/bin/konsole" ]; then cmd="/usr/bin/konsole" + # KDE4 konsole behaves differently from other terminals + IMEXIT="false" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then @@ -104,7 +106,7 @@ then IMEXIT="true" fi -if [ "$EXEC" != "" ] && [ -x `which $cmd` ]; then +if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $cmd #### some applications can quit immediately, we will wait here as long as x2goagent exists if [ "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]; then 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).