SliTaz Repositories

     1.1 --- a/phpvirtualbox/stuff/etc/init.d/vboxwebsrv	Mon Dec 20 14:58:13 2010 +0100
     1.2 +++ b/phpvirtualbox/stuff/etc/init.d/vboxwebsrv	Thu May 26 20:16:45 2016 +0300
     1.3 @@ -1,5 +1,5 @@
     1.4  #!/bin/sh
     1.5 -# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or 
     1.6 +# Start, stop and restart vboxwebsrv deamon on SliTaz, at boot time or
     1.7  # with the command line.
     1.8  #
     1.9  # To start daemon at boot time, just put vboxwebsrv in the $RUN_DAEMONS
    1.10 @@ -8,7 +8,7 @@
    1.11  . /etc/init.d/rc.functions
    1.12  
    1.13  NAME=$(basename $0)
    1.14 -DESC="$NAME deamon"
    1.15 +DESC="$(_ '%s daemon' $NAME)"
    1.16  DAEMON=$(which $NAME)
    1.17  OPTIONS="-b --logfile /dev/null"
    1.18  eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
    1.19 @@ -17,41 +17,40 @@
    1.20  case "$1" in
    1.21    start)
    1.22      if active_pidfile $PIDFILE $NAME ; then
    1.23 -      echo "$NAME is 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 > /dev/null 2>&1
    1.29 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
    1.30 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.31 +    $DAEMON $OPTIONS >/dev/null 2>&1
    1.32 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
    1.33      active_pidfile $PIDFILE $NAME
    1.34      status
    1.35      ;;
    1.36    stop)
    1.37      if ! active_pidfile $PIDFILE $NAME ; then
    1.38 -      echo "$NAME is not running."
    1.39 +      _ '%s is not running.' $NAME
    1.40        exit 1
    1.41      fi
    1.42 -    echo -n "Stopping $DESC: $NAME... "
    1.43 -    kill `cat $PIDFILE`
    1.44 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.45 +    kill $(cat $PIDFILE)
    1.46      status
    1.47      ;;
    1.48    restart)
    1.49      if ! active_pidfile $PIDFILE $NAME ; then
    1.50 -      echo "$NAME is not running."
    1.51 +      _ '%s is not running.' $NAME
    1.52        exit 1
    1.53      fi
    1.54 -    echo -n "Restarting $DESC: $NAME... "
    1.55 -    kill `cat $PIDFILE`
    1.56 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.57 +    kill $(cat $PIDFILE)
    1.58      sleep 2
    1.59 -    $DAEMON $OPTIONS > /dev/null 2>&1
    1.60 -    [ -f $PIDFILE ] || pidof $NAME | awk '{ print $1 }' > $PIDFILE
    1.61 +    $DAEMON $OPTIONS >/dev/null 2>&1
    1.62 +    [ -f $PIDFILE ] || pidof $NAME | awk '{print $1}' > $PIDFILE
    1.63      active_pidfile $PIDFILE $NAME
    1.64      status
    1.65      ;;
    1.66 -*)
    1.67 -    echo ""
    1.68 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    1.69 -    echo ""
    1.70 +  *)
    1.71 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.72 +    newline
    1.73      exit 1
    1.74      ;;
    1.75  esac