SliTaz Repositories

     1.1 --- a/cherokee/stuff/cherokee	Wed Aug 21 14:20:25 2013 +0000
     1.2 +++ b/cherokee/stuff/cherokee	Tue Jan 07 17:19:08 2020 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  #!/bin/sh
     1.5 -# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz, 
     1.6 +# /etc/init.d/cherokee: Start, stop and restart Cherokee web server on SliTaz,
     1.7  # at boot time or with the command line. Daemons options are configured
     1.8  # with /etc/daemons.conf
     1.9  #
    1.10 @@ -7,7 +7,7 @@
    1.11  . /etc/daemons.conf
    1.12  
    1.13  NAME=Cherokee
    1.14 -DESC="Cherokee Web Server"
    1.15 +DESC="$(_ 'Cherokee Web Server')"
    1.16  DAEMON=/usr/sbin/cherokee
    1.17  OPTIONS=
    1.18  PIDFILE=/var/run/cherokee.pid
    1.19 @@ -15,28 +15,28 @@
    1.20  case "$1" in
    1.21    start)
    1.22      if active_pidfile $PIDFILE cherokee ; then
    1.23 -      echo "$NAME already running."
    1.24 +      _ '%s is already running.' $NAME
    1.25        exit 1
    1.26      fi
    1.27 -    echo -n "Starting $DESC: $NAME... "
    1.28 -    $DAEMON $OPTIONS -d &>/dev/null  
    1.29 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.30 +    $DAEMON $OPTIONS -d &>/dev/null
    1.31      status
    1.32      ;;
    1.33    stop)
    1.34      if ! active_pidfile $PIDFILE cherokee ; then
    1.35 -      echo "$NAME is not running."
    1.36 +      _ '%s is not running.' $NAME
    1.37        exit 1
    1.38      fi
    1.39 -    echo -n "Stopping $DESC: $NAME... "
    1.40 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.41      kill $(cat $PIDFILE)
    1.42      status
    1.43      ;;
    1.44    restart)
    1.45      if ! active_pidfile $PIDFILE cherokee ; then
    1.46 -      echo "$NAME is not running."
    1.47 +      _ '%s is not running.' $NAME
    1.48        exit 1
    1.49      fi
    1.50 -    echo -n "Restarting $DESC: $NAME... "
    1.51 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.52      kill $(cat $PIDFILE)
    1.53      rm $PIDFILE
    1.54      sleep 2
    1.55 @@ -44,9 +44,8 @@
    1.56      status
    1.57      ;;
    1.58    *)
    1.59 -    echo ""
    1.60 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    1.61 -    echo ""
    1.62 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.63 +    newline
    1.64      exit 1
    1.65      ;;
    1.66  esac