[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-211-g5223f88

X2Go dev team git-admin at x2go.org
Thu Sep 19 00:01:07 CEST 2013


The branch, master has been updated
       via  5223f882a4ad051a3fdaedf0340cda67c1cd473f (commit)
      from  88acc5fef88df9c2e40b8ba356b950f5ee519848 (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 5223f882a4ad051a3fdaedf0340cda67c1cd473f
Author: Jürgen Hötzel <juergen at archlinux.org>
Date:   Wed Sep 11 21:21:33 2013 +0200

    Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305).

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

Summary of changes:
 debian/changelog              |    4 ++++
 x2goserver/bin/x2goruncommand |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b6ffa89..42f36f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,10 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
     - Move xfonts-base from Recommends: field to Depends: field (bin:package
       x2goserver).
 
+  [ Jürgen Hötzel ]
+  * New upstream version (4.0.1.7):
+    - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 13:37:12 +0200
 
 x2goserver (4.0.1.6-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 64469ed..7dcc7fb 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -194,14 +194,14 @@ if [ "$cmd" == "TERMINAL" ]; then
 	fi
 fi
 
-EXEC=`which $cmd`
+EXEC=`type -P $cmd`
 EXEC_WRAPPER=""
 
 BNAME=`basename "$EXEC"`
 if [ "$BNAME" == "rdesktop" ]
 then
 	IMEXIT="true"
-	if which padsp >/dev/null; then
+	if type padsp >/dev/null; then
 		EXEC_WRAPPER="padsp"
 		args=" -r sound:local"
 	fi


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




More information about the x2go-commits mailing list