[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-187-g1baf675

[X2go dev team]

The branch, master has been updated
       via  1baf675e4dd77d98c598df7f4a9c80fa47a620db (commit)
       via  469add7e3902442e00ca3a87c5e665673dce2547 (commit)
       via  b389abfb91c3d7855cf80910d0ec1d850ae44fbb (commit)
      from  bacef836dbccd17b4aafa2a50d02fdefeac9316a (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 1baf675e4dd77d98c598df7f4a9c80fa47a620db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 15 21:53:26 2011 +0200

    Add LibreOffice.org as possible OFFICE application to x2goruncommand.

commit 469add7e3902442e00ca3a87c5e665673dce2547
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 15 21:51:55 2011 +0200

    indentation fix

commit b389abfb91c3d7855cf80910d0ec1d850ae44fbb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 15 21:15:06 2011 +0200

    comment fix

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    1 +
 x2goserver/bin/x2goruncommand |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3356e02..05870f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Remove Debianisms from INSTALL howto.
   * Add chromium-browser as possible WWWBROWSER to x2goruncommand.
   * Add lxterminal as possible TERMINAL to x2goruncommand.
+  * Add LibreOffice.org as possible OFFICE application to x2goruncommand.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 4ce5a70..42156b9 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -74,10 +74,11 @@ if [ "$cmd" == "MAILCLIENT" ]; then
 fi
 
 if [ "$cmd" == "OFFICE" ]; then
-	if [ -e "/usr/bin/ooffice" ]
-     then
-         cmd="/usr/bin/ooffice"
-     fi
+	if [ -e "/usr/bin/loffice" ]; then
+		cmd="/usr/bin/loffice"
+	elif [ -e "/usr/bin/ooffice" ]; then
+		cmd="/usr/bin/ooffice"
+	fi
 fi
 
 if [ "$cmd" == "TERMINAL" ]; then
@@ -105,7 +106,7 @@ fi
 
 if [ "$EXEC" != "" ] && [ -x `which $cmd` ]; then
 	$cmd
-	#### some applications can quit immediately, we waiting until x2goagent exists
+	#### some applications can quit immediately, we will wait here as long as x2goagent exists
 	if [  "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]; then
 		while [ -d /proc/$X2GO_AGENT_PID ]; do
 			sleep 1


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).