[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.7-5-gff471f1

[X2Go dev team]

The branch, master has been updated
       via  ff471f1564e8de9c229abe408d5324fe48a51b40 (commit)
      from  aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (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 ff471f1564e8de9c229abe408d5324fe48a51b40
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 4 12:14:12 2012 +0200

    Stop x2gothinclient init script if either x2gothinclient_init or x2gothinclient_start is missing/non-executable.

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

Summary of changes:
 debian/changelog           |    2 ++
 debian/x2gothinclient.init |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6ea83fa..2e29800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (1.0.1.8):
     - Remove .halt file before shutting down.
     - Make x2gothinclient init script more robust.
+    - Stop x2gothinclient init script if either x2gothinclient_init or
+      x2gothinclient_start is missing/non-executable.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 13 Jun 2012 22:27:46 +0200
 
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
index 3f48c12..c62863f 100644
--- a/debian/x2gothinclient.init
+++ b/debian/x2gothinclient.init
@@ -36,7 +36,11 @@ NAME=x2gothinclient
 DESC="X2Go Thinclient Service"
 
 test -x $DAEMON || exit 0
-test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; }
+if [ -x /etc/x2go/x2gothinclient_init ] || [ -x /etc/x2go/x2gothinclient_start ]; then
+	echo "X2go thin client system will not start as it is not configured, yet."
+	echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"
+	exit 0
+fi
 
 # pre-init X2Go Thin Client through init script...
 test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

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 "x2gothinclient.git" (X2Go Thin Client Environment).