wok diff tinc/stuff/etc/init.d/tinc @ 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
'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 | 7710488e9e49 |
children | ff5fd8788cd9 |
line diff
1.1 --- a/tinc/stuff/etc/init.d/tinc Sat Feb 08 13:29:05 2014 +0000 1.2 +++ b/tinc/stuff/etc/init.d/tinc Thu May 26 20:16:45 2016 +0300 1.3 @@ -9,7 +9,7 @@ 1.4 . /etc/daemons.conf 1.5 1.6 NAME=tinc 1.7 -DESC="tinc deamon" 1.8 +DESC="$(_ '%s daemon' tinc)" 1.9 DAEMON=/usr/sbin/tincd 1.10 OPTIONS=$TINC_OPTIONS 1.11 PIDFILE=/var/run/tinc.pid 1.12 @@ -17,37 +17,36 @@ 1.13 case "$1" in 1.14 start) 1.15 if active_pidfile $PIDFILE tincd ; 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 tincd ; 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 - $DAEMON -k 1.34 + action 'Stopping %s: %s...' "$DESC" $NAME 1.35 + $DAEMON -k 1.36 status 1.37 ;; 1.38 restart) 1.39 if ! active_pidfile $PIDFILE tincd ; then 1.40 - echo "$NAME is not running." 1.41 + _ '%s is not running.' 1.42 exit 1 1.43 fi 1.44 - echo -n "Restarting $DESC: $NAME... " 1.45 - $DAEMON -k 1.46 + action 'Restarting %s: %s...' "$DESC" $NAME 1.47 + $DAEMON -k 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|reload|restart]" 1.57 + newline 1.58 exit 1 1.59 ;; 1.60 esac