[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 4.0.0.5-3-g186910d

[X2Go dev team]

The branch, build-baikal has been updated
       via  186910dbdd7cb875968a04ddbd8b046f953f1654 (commit)
      from  c338b408edd49d363fa139469d6701f745315fca (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    8 ++++++++
 x2goserver/bin/x2goruncommand |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9e5a9af..d0af1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
 x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream version (4.0.0.6):
     - Work around buggy X2Go Client on Mac OS. If the keyboard type
       is set to "query", we force X2GO_SET_KBD to 1.
       (Partly resolves: #112).
 
+  [ Oleksandr Shneyder ]
+  * New upstream version (4.0.0.6):
+    - Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC
+      variable if command have the arguments wich have same names as existing
+      commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl".
+      Now we splitting $cmd and taking only first part.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 25 Sep 2013 12:19:16 +0200
 
 x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 2f95341..9350352 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -183,7 +183,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 	fi
 fi
 
-EXEC=`which $cmd`
+WCMD=`echo $cmd | cut -d " " -f 1`
+EXEC=`type -P $WCMD`
 EXEC_WRAPPER=""
 
 BNAME=`basename "$EXEC"`


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