wok diff tinyproxy/stuff/tinyproxy @ rev 19159

/etc/init.d/*: use 'action' in pair with 'status'.
'action' returns translated message, so why not to add full translatable /etc/init.d/* content
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu May 26 20:16:45 2016 +0300 (2016-05-26)
parents 156441c8051a
children ff5fd8788cd9
line diff
     1.1 --- a/tinyproxy/stuff/tinyproxy	Fri Oct 29 01:21:54 2010 +0000
     1.2 +++ b/tinyproxy/stuff/tinyproxy	Thu May 26 20:16:45 2016 +0300
     1.3 @@ -4,7 +4,7 @@
     1.4  . /etc/init.d/rc.functions
     1.5  
     1.6  NAME=Tinyproxy
     1.7 -DESC="Tiny Proxy"
     1.8 +DESC="$(_ 'Tiny Proxy')"
     1.9  DAEMON=/usr/sbin/tinyproxy
    1.10  OPTION="-c"
    1.11  PIDFILE=/var/run/tinyproxy.pid
    1.12 @@ -12,29 +12,29 @@
    1.13  case "$1" in
    1.14    start)
    1.15      if active_pidfile $PIDFILE tinyproxy ; then
    1.16 -      echo "$NAME already running."
    1.17 +      _ '%s is already running.' $NAME
    1.18        exit 1
    1.19      fi
    1.20 -    echo -n "Starting $DESC: $NAME... "
    1.21 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.22      $DAEMON $OPTION /etc/tinyproxy/tinyproxy.conf
    1.23      status
    1.24      ;;
    1.25    stop)
    1.26      if ! active_pidfile $PIDFILE tinyproxy ; then
    1.27 -      echo "$NAME is not running."
    1.28 +      _ '%s is not running.' $NAME
    1.29        exit 1
    1.30      fi
    1.31 -    echo -n "Stopping $DESC: $NAME... "
    1.32 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.33      killall tinyproxy
    1.34      rm $PIDFILE
    1.35      status
    1.36      ;;
    1.37    restart)
    1.38      if ! active_pidfile $PIDFILE tinyproxy ; then
    1.39 -      echo "$NAME is not running."
    1.40 +      _ '%s is not running.' $NAME
    1.41        exit 1
    1.42      fi
    1.43 -    echo -n "Restarting $DESC: $NAME... "
    1.44 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.45      killall tinyproxy
    1.46      rm $PIDFILE
    1.47      sleep 2
    1.48 @@ -42,11 +42,10 @@
    1.49      status
    1.50      ;;
    1.51    *)
    1.52 -    echo ""
    1.53 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    1.54 -    echo ""
    1.55 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.56 +    newline
    1.57      exit 1
    1.58      ;;
    1.59  esac
    1.60  
    1.61 -exit 0
    1.62 \ No newline at end of file
    1.63 +exit 0