wok diff dbus/stuff/etc/init.d/dbus @ rev 25157

updated pugixml (1.10 -> 1.12.1)
author Hans-G?nter Theisgen
date Thu Jun 30 16:40:03 2022 +0100 (2022-06-30)
parents d4cf16d55526
children
line diff
     1.1 --- a/dbus/stuff/etc/init.d/dbus	Mon May 05 19:10:34 2014 +0200
     1.2 +++ b/dbus/stuff/etc/init.d/dbus	Thu Jun 30 16:40:03 2022 +0100
     1.3 @@ -7,7 +7,7 @@
     1.4  . /etc/daemons.conf
     1.5  
     1.6  NAME=DBUS
     1.7 -DESC="message bus daemon"
     1.8 +DESC="$(_ 'message bus daemon')"
     1.9  DAEMON=/usr/bin/dbus-daemon
    1.10  OPTIONS=$DBUS_OPTIONS
    1.11  PIDFILE=/run/dbus/pid
    1.12 @@ -20,41 +20,40 @@
    1.13  case "$1" in
    1.14    start)
    1.15      if active_pidfile $PIDFILE dbus-daemon ; then
    1.16 -      echo "$NAME already running."
    1.17 +      _ '%s is already running.' $NAME
    1.18        exit 1
    1.19      fi
    1.20      mkdir -p /run/dbus
    1.21 -    echo -n "Starting $DESC: $NAME... "
    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 dbus-daemon ; 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 -    kill `cat $PIDFILE`
    1.34 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.35 +    kill $(cat $PIDFILE)
    1.36      rm $PIDFILE
    1.37      status
    1.38      ;;
    1.39    restart)
    1.40      if ! active_pidfile $PIDFILE dbus-daemon ; then
    1.41 -      echo "$NAME is not running."
    1.42 +      _ '%s is not running.' $NAME
    1.43        exit 1
    1.44      fi
    1.45      mkdir -p /run/dbus
    1.46 -    echo -n "Restarting $DESC: $NAME... "
    1.47 -    kill `cat $PIDFILE`
    1.48 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.49 +    kill $(cat $PIDFILE)
    1.50      rm $PIDFILE
    1.51      sleep 2
    1.52      $DAEMON $OPTIONS
    1.53      status
    1.54      ;;
    1.55    *)
    1.56 -    echo ""
    1.57 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    1.58 -    echo ""
    1.59 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.60 +    newline
    1.61      exit 1
    1.62      ;;
    1.63  esac