$NetBSD: patch-ab,v 1.2 2003/12/30 16:46:04 cjep Exp $ --- milter-spamc.sh.in.orig Wed Oct 29 11:44:01 2003 +++ milter-spamc.sh.in Tue Oct 7 13:38:30 2003 @@ -9,10 +9,10 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" PROGRAM="@sbindir@/@PACKAGE_NAME@" -OPTIONS="unix:@localstatedir@/lib/@PACKAGE_NAME@/socket" -REQUIRED_DIR="@localstatedir@/lib/@PACKAGE_NAME@" +OPTIONS="unix:@localstatedir@/@PACKAGE_NAME@/socket" +REQUIRED_DIR="@localstatedir@/@PACKAGE_NAME@" FG_RED='\033[1;31m' FG_GREEN='\033[1;32m' FG_WHITE='\033[0;37m' @@ -68,9 +68,9 @@ printf "Starting %s" $NAME pid=`getpid "$PROGRAM"` if [ X"$pid" != X ]; then - printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n' + printf '\n' return fi # Make sure the old socket has been removed, especially for FreeBSD. @@ -81,13 +81,13 @@ sh -c "$PROGRAM $OPTIONS &" pid=`getpid "$PROGRAM"` if [ X"$pid" = X ]; then - printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n' + printf '\n' return fi - printf '\r\033[71C['${FG_GREEN}' OK '${FG_NORMAL}']\n' + printf '\n' } stop() { @@ -105,14 +105,14 @@ sleep 2 pid=`getpid "$PROGRAM"` if [ X"$pid" != X ]; then - printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n' + printf '\n' return fi fi - printf '\r\033[71C['${FG_GREEN}' OK '${FG_NORMAL}']\n' + printf '\n' } case "$1" in restart) @@ -127,11 +127,11 @@ ;; status) pid=`getpid "$PROGRAM"` if [ X"$pid" != X ]; then - printf '\r\033[72C['${FG_GREEN}${pid}${FG_NORMAL}']\n' + printf '\n' else - printf '\r\033[70C['${FG_RED}'STOPPED'${FG_NORMAL}']\n' + printf '\n' fi ;; *) printf 'Usage: %s {start|stop|restart|status}\n' $0