Commit 8953de01 authored by anarcat's avatar anarcat

make output on one line

parent 8d99303c
...@@ -72,15 +72,15 @@ do_reload() { ...@@ -72,15 +72,15 @@ do_reload() {
case "$1" in case "$1" in
start) start)
[ "$VERBOSE" != no ] && echo "Starting $DESC... " [ "$VERBOSE" != no ] && printf "Starting $DESC... "
do_start do_start
case "$?" in case "$?" in
0|1) [ "$VERBOSE" != no ] && echo "ok" ;; 0|1) [ "$VERBOSE" != no ] && echo ok ;;
2) [ "$VERBOSE" != no ] && echo "FAIL" ;; 2) [ "$VERBOSE" != no ] && echo FAIL ;;
esac esac
;; ;;
stop) stop)
[ "$VERBOSE" != no ] && echo "Stopping $DESC... " [ "$VERBOSE" != no ] && printf "Stopping $DESC... "
do_stop do_stop
case "$?" in case "$?" in
0|1) [ "$VERBOSE" != no ] && echo ok ;; 0|1) [ "$VERBOSE" != no ] && echo ok ;;
...@@ -98,15 +98,15 @@ case "$1" in ...@@ -98,15 +98,15 @@ case "$1" in
fi fi
;; ;;
reload|force-reload) reload|force-reload)
[ "$VERBOSE" != no ] && echo "Reloading $DESC" [ "$VERBOSE" != no ] && printf "Reloading $DESC... "
do_reload do_reload && echo ok || echo FAIL
;; ;;
restart) restart)
# #
# If the "reload" option is implemented then remove the # If the "reload" option is implemented then remove the
# 'force-reload' alias # 'force-reload' alias
# #
[ "$VERBOSE" != no ] && echo "Restarting $DESC" [ "$VERBOSE" != no ] && printf "Restarting $DESC... "
do_stop do_stop
case "$?" in case "$?" in
0|1) 0|1)
...@@ -115,7 +115,7 @@ case "$1" in ...@@ -115,7 +115,7 @@ case "$1" in
*) *)
# Failed to stop # Failed to stop
ret=$? ret=$?
[ "$VERBOSE" != no ] && echo " FAIL" [ "$VERBOSE" != no ] && echo FAIL
return $ret return $ret
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment