wok diff postgresql/stuff/etc/init.d/postgresql @ 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 a44a640b886e
children
line diff
     1.1 --- a/postgresql/stuff/etc/init.d/postgresql	Wed Feb 17 22:01:10 2010 +0100
     1.2 +++ b/postgresql/stuff/etc/init.d/postgresql	Thu May 26 20:16:45 2016 +0300
     1.3 @@ -9,7 +9,7 @@
     1.4  . /etc/daemons.conf
     1.5  
     1.6  NAME=Postgresql
     1.7 -DESC="PostgreSQL server"
     1.8 +DESC="$(_ '%s server' PostgreSQL)"
     1.9  OPTIONS=$PGSQL_OPTIONS
    1.10  INIT_OPTIONS=$PGSQLINIT_OPTIONS
    1.11  [ -n "$OPTIONS" ] || OPTIONS="-D /var/lib/pgsql -s"
    1.12 @@ -18,42 +18,41 @@
    1.13  case "$1" in
    1.14    start)
    1.15      if [ ! -f /var/lib/pgsql/PG_VERSION ]; then
    1.16 -        echo "Initializing $DESC database"
    1.17 -	rm -rf /var/lib/pgsql/* 2> /dev/null
    1.18 -        su -c "initdb $INIT_OPTIONS" - postgres
    1.19 +      _ 'Initializing PostgreSQL server database'
    1.20 +      rm -rf /var/lib/pgsql/* 2>/dev/null
    1.21 +      su -c "initdb $INIT_OPTIONS" - postgres
    1.22      fi
    1.23 -    echo -n "Starting $DESC: $NAME... "
    1.24 +    action 'Starting %s: %s...' "$DESC" $NAME
    1.25      su -c "pg_ctl start -w $OPTIONS -l /var/log/postgresql/postgresql.log" - postgres
    1.26      status
    1.27      sleep 2
    1.28      for i in /etc/pgsql.d/* ; do
    1.29 -      	    [ -x $i ] || continue
    1.30 -      	    echo -n "Running $i..."
    1.31 -      	    $i
    1.32 -      	    status
    1.33 +      [ -x $i ] || continue
    1.34 +      action 'Running %s...' $i
    1.35 +      $i
    1.36 +      status
    1.37      done
    1.38 -# su -c "createdb test" - postgres
    1.39 -# su -c "psql test" - postgres
    1.40 +    # su -c "createdb test" - postgres
    1.41 +    # su -c "psql test" - postgres
    1.42      ;;
    1.43    stop)
    1.44 -    echo -n "Stopping $DESC: $NAME... "
    1.45 +    action 'Stopping %s: %s...' "$DESC" $NAME
    1.46      su -c "pg_ctl stop $OPTIONS -m smart" - postgres
    1.47      status
    1.48      ;;
    1.49    restart)
    1.50 -    echo -n "Restarting $DESC: $NAME... "
    1.51 +    action 'Restarting %s: %s...' "$DESC" $NAME
    1.52      su -c "pg_ctl restart $OPTIONS -m smart" - postgres
    1.53      status
    1.54      ;;
    1.55    reload)
    1.56 -    echo -n "Reloading $DESC: $NAME... "
    1.57 +    action 'Reloading %s: %s...' "$DESC" $NAME
    1.58      su -c "pg_ctl reload $OPTIONS" - postgres
    1.59      status
    1.60      ;;
    1.61    *)
    1.62 -    echo ""
    1.63 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart|reload]"
    1.64 -    echo ""
    1.65 +    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart|reload]"
    1.66 +    newline
    1.67      exit 1
    1.68      ;;
    1.69  esac