[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-38-g440fb47
W. van den Akker
wvdakker at wilsoft.nl
Fri May 17 22:36:59 UTC 2013
The following commit has been merged in the master branch:
commit 83e3e3fe0bbdf2a971d5f13f6e59967b023dfa96
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date: Fri May 17 21:20:15 2013 +0200
Make debian/init, debian/component.d/* less bashish.
diff --git a/debian/changelog b/debian/changelog
index b80292d..4c95f74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jabberd2 (2.2.17-3) UNRELEASED; urgency=low
+
+ * debian/init, debian/component.d/*: Make less bashish.
+
+ -- Willem van den Akker <wvdakker at wilsoft.nl> Fri, 17 May 2013 21:17:31 +0200
+
jabberd2 (2.2.17-2) unstable; urgency=low
* Corrected typo in changelog.
diff --git a/debian/component.d/10router b/debian/component.d/10router
index d2fc88e..c4060df 100644
--- a/debian/component.d/10router
+++ b/debian/component.d/10router
@@ -17,36 +17,36 @@ test -f ${COMMAND} || exit 0
case "$1" in
start)
- echo -n " ${NAME}"
- if [ ! `pidof ${COMMAND}` ]; then
+ printf " ${NAME}"
+ if [ ! `pidof ${COMMAND}` ]; then
start-stop-daemon -b -c ${USER}:${GROUP} \
- --start --pidfile ${PIDFILE} --quiet \
- --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
- fi
+ --start --pidfile ${PIDFILE} --quiet \
+ --exec ${COMMAND} -- -c ${CONFFILE} || printf "<Failed>"
+ fi
;;
stop)
- echo -n " ${NAME}"
- start-stop-daemon -o -u ${USER} --stop --quiet \
- --signal 15 --retry 3 --pidfile ${PIDFILE} \
- --exec ${COMMAND} || echo -n "<Failed>"
+ printf " ${NAME}"
+ start-stop-daemon -o -u ${USER} --stop --quiet \
+ --signal 15 --retry 3 --pidfile ${PIDFILE} \
+ --exec ${COMMAND} || printf "<Failed>"
;;
status)
- echo -n "${NAME}"
- if [ `pidof ${COMMAND}` ]; then
- echo " running"
- else
- echo " not running"
- fi
+ printf "${NAME}"
+ if [ `pidof ${COMMAND}` ]; then
+ printf " running\n"
+ else
+ printf " not running\n"
+ fi
;;
restart)
- $0 stop
- sleep 1
- $0 start
- ;;
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
*)
- echo "`basename $0` called with unknown option {$1}"
- exit 1
- ;;
+ printf "`basename $0` called with unknown option {$1}\n"
+ exit 1
+ ;;
esac
exit 0
diff --git a/debian/component.d/30sm b/debian/component.d/30sm
index 1ef5da6..679500c 100644
--- a/debian/component.d/30sm
+++ b/debian/component.d/30sm
@@ -16,36 +16,36 @@ test "${SM_RUN}" != 0 || exit 0
test -f ${COMMAND} || exit 0
case "$1" in
- start)
- echo -n " ${NAME}"
- if [ ! `pidof ${COMMAND}` ]; then
- start-stop-daemon -b -c ${USER}:${GROUP} \
- --start --pidfile ${PIDFILE} --quiet \
- --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
- fi
+ start)
+ printf " ${NAME}"
+ if [ ! `pidof ${COMMAND}` ]; then
+ start-stop-daemon -b -c ${USER}:${GROUP} \
+ --start --pidfile ${PIDFILE} --quiet \
+ --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
+ fi
;;
stop)
- echo -n " ${NAME}"
- start-stop-daemon -o -u ${USER} --stop --quiet \
- --signal 15 --retry 3 --pidfile ${PIDFILE} \
- --exec ${COMMAND} || echo -n "<Failed>"
+ printf " ${NAME}"
+ start-stop-daemon -o -u ${USER} --stop --quiet \
+ --signal 15 --retry 3 --pidfile ${PIDFILE} \
+ --exec ${COMMAND} || printf "<Failed>"
;;
status)
- echo -n "${NAME}"
- if [ `pidof ${COMMAND}` ]; then
- echo " running"
- else
- echo " not running"
- fi
+ printf "${NAME}"
+ if [ `pidof ${COMMAND}` ]; then
+ printf " running\n"
+ else
+ printf " not running\n"
+ fi
;;
restart)
- $0 stop
- sleep 1
- $0 start
- ;;
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
*)
- echo "`basename $0` called with unknown option {$1}"
- exit 1
+ printf "`basename $0` called with unknown option {$1}\n"
+ exit 1
;;
esac
diff --git a/debian/component.d/40s2s b/debian/component.d/40s2s
index d425051..8e4107a 100644
--- a/debian/component.d/40s2s
+++ b/debian/component.d/40s2s
@@ -17,34 +17,34 @@ test -f ${COMMAND} || exit 0
case "$1" in
start)
- echo -n " ${NAME}"
- if [ ! `pidof ${COMMAND}` ]; then
- start-stop-daemon -b -c ${USER}:${GROUP} \
+ printf " ${NAME}"
+ if [ ! `pidof ${COMMAND}` ]; then
+ start-stop-daemon -b -c ${USER}:${GROUP} \
--start --pidfile ${PIDFILE} --quiet \
- --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
- fi
+ --exec ${COMMAND} -- -c ${CONFFILE} || printf "<Failed>"
+ fi
;;
stop)
- echo -n " ${NAME}"
- start-stop-daemon -o -u ${USER} --stop --quiet \
- --signal 15 --retry 3 --pidfile ${PIDFILE} \
- --exec ${COMMAND} || echo -n "<Failed>"
+ printf " ${NAME}"
+ start-stop-daemon -o -u ${USER} --stop --quiet \
+ --signal 15 --retry 3 --pidfile ${PIDFILE} \
+ --exec ${COMMAND} || printf "<Failed>"
;;
status)
- echo -n "${NAME}"
- if [ `pidof ${COMMAND}` ]; then
- echo " running"
- else
- echo " not running"
- fi
+ printf "${NAME}"
+ if [ `pidof ${COMMAND}` ]; then
+ printf " running\n"
+ else
+ printf " not running\n"
+ fi
;;
restart)
- $0 stop
- sleep 1
- $0 start
- ;;
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
*)
- echo "`basename $0` called with unknown option {$1}"
+ printf "`basename $0` called with unknown option {$1}\n"
exit 1
;;
esac
diff --git a/debian/component.d/50c2s b/debian/component.d/50c2s
index 00eb475..6138a63 100644
--- a/debian/component.d/50c2s
+++ b/debian/component.d/50c2s
@@ -17,36 +17,36 @@ test -f ${COMMAND} || exit 0
case "$1" in
start)
- echo -n " ${NAME}"
- if [ ! `pidof ${COMMAND}` ]; then
- start-stop-daemon -b -c ${USER}:${GROUP} \
- --start --pidfile ${PIDFILE} --quiet \
- --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
- fi
+ printf " ${NAME}"
+ if [ ! `pidof ${COMMAND}` ]; then
+ start-stop-daemon -b -c ${USER}:${GROUP} \
+ --start --pidfile ${PIDFILE} --quiet \
+ --exec ${COMMAND} -- -c ${CONFFILE} || printf "<Failed>"
+ fi
;;
stop)
- echo -n " ${NAME}"
- start-stop-daemon -o -u ${USER} --stop --quiet \
- --signal 15 --retry 3 --pidfile ${PIDFILE} \
- --exec ${COMMAND} || echo -n "<Failed>"
+ printf " ${NAME}"
+ start-stop-daemon -o -u ${USER} --stop --quiet \
+ --signal 15 --retry 3 --pidfile ${PIDFILE} \
+ --exec ${COMMAND} || printf "<Failed>"
;;
status)
- echo -n "${NAME}"
- if [ `pidof ${COMMAND}` ]; then
- echo " running"
- else
- echo " not running"
- fi
+ printf "${NAME}"
+ if [ `pidof ${COMMAND}` ]; then
+ printf " running]\n"
+ else
+ printf " not running\n"
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ printf "`basename $0` called with unknown option {$1}\n"
+ exit 1
;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "`basename $0` called with unknown option {$1}"
- exit 1
- ;;
esac
exit 0
diff --git a/debian/init b/debian/init
index 7ef5b1e..14b2790 100644
--- a/debian/init
+++ b/debian/init
@@ -27,25 +27,25 @@ fi
case "$1" in
start)
- echo -n "Starting Jabber services:"
+ printf "Starting Jabber services:"
if [ -z "$2" ]; then
run-parts --arg=start ${COMPONENTDPATH}
else
${COMPONENTDPATH}/??$2 start
fi
- echo "."
+ printf ".\n"
;;
stop)
- echo -n "Stopping Jabber services:"
+ printf "Stopping Jabber services:"
if [ -z "$2" ]; then
run-parts --reverse --arg=stop ${COMPONENTDPATH}
else
${COMPONENTDPATH}/??$2 stop
fi
- echo "."
+ printf ".\n"
;;
status)
- echo "Status Jabber services:"
+ printf "Status Jabber services:\n"
if [ -z "$2" ]; then
run-parts --reverse --arg=status ${COMPONENTDPATH}
else
@@ -53,16 +53,16 @@ case "$1" in
fi
;;
restart|force-reload)
- echo "Restarting Jabber services:"
+ printf "Restarting Jabber services:\n"
$0 stop $2
sleep 1
$0 start $2
;;
*)
- # echo "Usage: $N {start|stop|status|restart|reload|force-reload}" >&2
- echo "Usage: $0 {action} [component]" >&2
- echo " action = start|stop|status|restart|force-reload" >&2
- echo " component = router|sm|s2s|c2s" >&2
+ # printf "Usage: $N {start|stop|status|restart|reload|force-reload}\n" >&2
+ printf "Usage: $0 {action} [component]\n" >&2
+ printf " action = start|stop|status|restart|force-reload\n" >&2
+ printf " component = router|sm|s2s|c2s\n" >&2
exit 1
;;
esac
--
Jabberd2 XMPP server
More information about the Pkg-xmpp-commits
mailing list