[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-233-ge624ebc

[X2Go dev team]

The branch, master has been updated
       via  e624ebc4909db5813271b07e9544cd3474ead94e (commit)
      from  a7e839f2e04cdae838d11d13f1c8f833e0c1c665 (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 e624ebc4909db5813271b07e9544cd3474ead94e
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Nov 14 18:12:38 2013 +0100

    fixed x2goruncommand
    
    * New upstream version (4.1.0.0):
      - fixed 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.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e2a7985..0abc0b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (4.1.0.0):
     - Use new script x2gopath in Perl::API. (Fixes: #86).
 
+  [ Oleksandr Shneyder ]
+  * New upstream version (4.1.0.0):
+    - fixed 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.
+
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
 x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 7dcc7fb..7cc8f84 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -194,7 +194,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 	fi
 fi
 
-EXEC=`type -P $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).