wok diff bind/stuff/etc/init.d/named @ 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 297964ebacad
children ff5fd8788cd9
line diff
     1.1 --- a/bind/stuff/etc/init.d/named	Sat Feb 21 21:27:14 2009 +0000
     1.2 +++ b/bind/stuff/etc/init.d/named	Thu May 26 20:16:45 2016 +0300
     1.3 @@ -9,7 +9,7 @@
     1.4  . /etc/daemons.conf
     1.5  
     1.6  NAME=Named
     1.7 -DESC="Named deamon"
     1.8 +DESC="$(_ '%s daemon' Named)"
     1.9  DAEMON=/usr/sbin/named
    1.10  OPTIONS=$NAMED_OPTIONS
    1.11  PIDFILE=/var/run/named.pid
    1.12 @@ -19,19 +19,19 @@
    1.13  case "$1" in
    1.14    start)
    1.15      if active_pidfile $PIDFILE named ; 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 -    $DAEMON $OPTIONS 
    1.22 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.23 +    $DAEMON $OPTIONS
    1.24      status
    1.25      ;;
    1.26    stop)
    1.27      if ! active_pidfile $PIDFILE named ; then
    1.28 -      echo "$NAME is not running."
    1.29 +      _ '%s is not running.' $NAME
    1.30        exit 1
    1.31      fi
    1.32 -    echo -n "Stopping $DESC: $NAME... "
    1.33 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.34      /usr/sbin/rndc stop
    1.35      status
    1.36      ;;
    1.37 @@ -41,19 +41,18 @@
    1.38      ;;
    1.39    restart)
    1.40      if ! active_pidfile $PIDFILE named ; then
    1.41 -      echo "$NAME is not running."
    1.42 +      _ '%s is not running.' $NAME
    1.43        exit 1
    1.44      fi
    1.45 -    echo -n "Restarting $DESC: $NAME... "
    1.46 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.47      /usr/sbin/rndc stop
    1.48      sleep 2
    1.49      $DAEMON $OPTIONS
    1.50      status
    1.51      ;;
    1.52    *)
    1.53 -    echo ""
    1.54 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
    1.55 -    echo ""
    1.56 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
    1.57 +    newline
    1.58      exit 1
    1.59      ;;
    1.60  esac