x2gothinclient.git - master (branch) updated: 1.0.1.8-81-g72b928a - x2go-commits

29 Mar 2013

The branch, master has been updated
       via  72b928a147fbe6b7765cc1b94bc74f6fe98a8553 (commit)
       via  6e6ebae510f6fdf0c547e9908e5e471cc9e05a14 (commit)
      from  55b9ba6b3223f5aec50c3b0c18250efd17f93f3c (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 72b928a147fbe6b7765cc1b94bc74f6fe98a8553
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Mar 29 18:56:45 2013 +0100

    fix tab indentations

commit 6e6ebae510f6fdf0c547e9908e5e471cc9e05a14
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Mar 29 18:55:01 2013 +0100

    use lsb init functions for x2gocdmanager

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

Summary of changes:
 debian/x2gocdmanager.init |   79 +++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 49 deletions(-)

The diff of changes is:

diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init
index a7d6e8a..d759d30 100644
--- a/debian/x2gocdmanager.init
+++ b/debian/x2gocdmanager.init
@@ -29,6 +29,16 @@
 # Short-Description: Start and stop the x2go CD/DVD manager daemon
 ### END INIT INFO
 
+set -e
+
+# use system's locale settings for the X2Go Client in TCE mode
+if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG LANGUAGE
+fi
+
+. /lib/lsb/init-functions
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 export HOSTNAME
 DAEMON=/usr/sbin/x2gocdmanager
@@ -37,60 +47,31 @@ DESC=x2gocdmanager
 
 test -x $DAEMON || exit 0
 
-
-set -e
-
 case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+	start)
+		log_daemon_msg "Starting $DESC" "x2gocdmanager"
+		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		log_end_msg $?
 	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
-	
-	echo "$NAME."
+	stop)
+		log_daemon_msg "Stopping $DESC" "x2gocdmanager"
+		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
+		log_end_msg $?
 	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid  \
-	&& $0 restart \
-	|| exit 0
+	force-reload)
+		start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
 	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid 
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+	restart)
+		log_daemon_msg "Restarting $DESC" "x2gocdmanager"
+		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
+		sleep 1
+		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		log_end_msg $?
 	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
+	*)
+		N=/etc/init.d/$NAME
+		echo "Usage: $N {start|stop|restart|force-reload}" >&2
+		exit 1
 	;;
 esac
 


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

    