[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-72-gcbd735c
X2Go dev team
git-admin at x2go.org
Fri Mar 29 17:18:38 CET 2013
The branch, master has been updated
via cbd735c414b251daf4cc7ee1b9b81aa640744215 (commit)
from 3556daf2eeffa81046d247320d41673595571be3 (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 cbd735c414b251daf4cc7ee1b9b81aa640744215
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Mar 29 17:18:14 2013 +0100
fix tab indentations
-----------------------------------------------------------------------
Summary of changes:
debian/x2gothinclient.init | 60 ++++++++++++++++++++--------------------
debian/x2gothinclient.postinst | 24 ++++++++--------
2 files changed, 42 insertions(+), 42 deletions(-)
The diff of changes is:
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
index 56b817b..d5ae470 100644
--- a/debian/x2gothinclient.init
+++ b/debian/x2gothinclient.init
@@ -61,40 +61,40 @@ HEED_DEFAULT_DISPLAY_MANAGER=${HEED_DEFAULT_DISPLAY_MANAGER:-true}
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
case "$1" in
- start)
- CONFIGURED_DAEMON="$(basename \"$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)\")"
- if grep -wqs text /proc/cmdline; then
- log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
- elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
- [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
- [ "$CONFIGURED_DAEMON" != x2gothinclientd ] ; then
- log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager"
- else
- log_daemon_msg "Starting $DESC" "x2gothinclientd"
- start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
- log_end_msg $?
- fi
+ start)
+ CONFIGURED_DAEMON="$(basename \"$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)\")"
+ if grep -wqs text /proc/cmdline; then
+ log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+ elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+ [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+ [ "$CONFIGURED_DAEMON" != x2gothinclientd ] ; then
+ log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager"
+ else
+ log_daemon_msg "Starting $DESC" "x2gothinclientd"
+ start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+ log_end_msg $?
+ fi
;;
- stop)
- if [ -e /var/run/$NAME.pid ]; then
- log_daemon_msg "Stopping $DESC" "x2gothinclientd"
- start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running"
- log_end_msg $?
- fi
+ stop)
+ if [ -e /var/run/$NAME.pid ]; then
+ log_daemon_msg "Stopping $DESC" "x2gothinclientd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running"
+ log_end_msg $?
+ fi
;;
- force-reload)
- # 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)
+ # check wether $DAEMON is running. If so, restart
+ start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
;;
- restart)
- $0 stop
- sleep 1
- $0 start
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
;;
- *)
- N=/etc/init.d/$NAME
- 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
diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient.postinst
index be096ce..9bfee43 100755
--- a/debian/x2gothinclient.postinst
+++ b/debian/x2gothinclient.postinst
@@ -78,18 +78,18 @@ case "$1" in
if getent group plugdev 1>/dev/null; then adduser x2gothinclient plugdev; fi
if ! getent group scard 1>/dev/null; then groupadd --system scard; fi
if getent group scard 1>/dev/null; then adduser x2goclient scard; fi
- else
- echo "User x2gothinclient already exists." >&2
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ else
+ echo "User x2gothinclient already exists." >&2
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
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).
More information about the x2go-commits
mailing list