This file is sourced by the shell. Applications can be specified e.g. like this: WWWBROWSER=/usr/bin/google-chrome MAILCLIENT=/local/thunderbird/bin/thunderbird If the application does not exist, or is not specified, the hard coded list will be consulted --- x2goserver/bin/x2goruncommand | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b88c3b9..7d826b5 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -31,6 +31,10 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +if [ $HOME/.x2go/applications ]; then + . $HOME/.x2go/applications +fi + export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION @@ -131,7 +135,9 @@ elif [ "$cmd" == "TRINITY" ]; then fi if [ "$cmd" == "WWWBROWSER" ]; then - if [ -e "/usr/bin/firefox" ]; then + if [ -n "$WWWBROWSER" ] && [ -e "$WWWBROWSER" ]; then + cmd="$WWWBROWSER" + elif [ -e "/usr/bin/firefox" ]; then cmd="/usr/bin/firefox" elif [ -e "/usr/bin/iceweasel" ]; then cmd="/usr/bin/iceweasel" @@ -147,7 +153,9 @@ if [ "$cmd" == "WWWBROWSER" ]; then fi if [ "$cmd" == "MAILCLIENT" ]; then - if [ -e "/usr/bin/thunderbird" ]; then + if [ -n "$MAILCLIENT" ] && [ -e "$MAILCLIENT" ]; then + cmd="$MAILCLIENT" + elif [ -e "/usr/bin/thunderbird" ]; then cmd="/usr/bin/thunderbird" elif [ -e "/usr/bin/icedove" ]; then cmd="/usr/bin/icedove" @@ -159,7 +167,9 @@ if [ "$cmd" == "MAILCLIENT" ]; then fi if [ "$cmd" == "OFFICE" ]; then - if [ -e "/usr/bin/loffice" ]; then + if [ -n "$OFFICE" ] && [ -e "$OFFICE" ]; then + cmd="$OFFICE" + elif [ -e "/usr/bin/loffice" ]; then cmd="/usr/bin/loffice" elif [ -e "/usr/bin/ooffice" ]; then cmd="/usr/bin/ooffice" @@ -168,7 +178,9 @@ fi if [ "$cmd" == "TERMINAL" ]; then IMEXIT="true" - if [ -e "/usr/bin/konsole" ]; then + if [ -n "$TERMINAL" ] && [ -e "$TERMINAL" ]; then + cmd="$TERMINAL" + elif [ -e "/usr/bin/konsole" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" -- 1.7.9.5