SliTaz Repositories

     1.1 --- a/openssh/stuff/openssh	Fri Dec 11 00:40:59 2015 +0200
     1.2 +++ b/openssh/stuff/openssh	Tue Nov 01 04:07:59 2016 +0200
     1.3 @@ -9,7 +9,7 @@
     1.4  . /etc/daemons.conf
     1.5  
     1.6  NAME=OpenSSH
     1.7 -DESC="OpenSSH server"
     1.8 +DESC="$(_ '%s server' OpenSSH)"
     1.9  DAEMON=/usr/sbin/sshd
    1.10  OPTIONS=$OPENSSH_OPTIONS
    1.11  PIDFILE=/var/run/sshd.pid
    1.12 @@ -20,47 +20,47 @@
    1.13  	start)
    1.14  		# We need rsa and dsa host key file to start dropbear.
    1.15  		if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then
    1.16 -			echo "Generating $NAME rsa key... "
    1.17 +			_ 'Generating OpenSSH %s key... ' rsa
    1.18  			ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N ''
    1.19  		fi
    1.20  		if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then
    1.21 -			echo "Generating $NAME dsa key... "
    1.22 +			_ 'Generating OpenSSH %s key... ' dsa
    1.23  			ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
    1.24  		fi
    1.25  		if [ ! -f /etc/ssh/ssh_host_ecdsa_key ] ; then
    1.26 -			echo "Generating $NAME ecdsa key... "
    1.27 +			_ 'Generating OpenSSH %s key... ' ecdsa
    1.28  			ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C '' -N ''
    1.29  		fi
    1.30  		if active_pidfile $PIDFILE sshd ; then
    1.31 -			echo "$NAME already running."
    1.32 +			_ '%s is already running.' $NAME
    1.33  			exit 1
    1.34  		fi
    1.35 -		action "Starting $DESC: $NAME... "
    1.36 +		action 'Starting %s: %s...' "$DESC" $NAME
    1.37  		$DAEMON $OPTIONS
    1.38  		status
    1.39  		;;
    1.40  	stop)
    1.41  		if ! active_pidfile $PIDFILE sshd ; then
    1.42 -			echo "$NAME is not running."
    1.43 +			_ '%s is not running.' $NAME
    1.44  			exit 1
    1.45  		fi
    1.46 -		action "Stopping $DESC: $NAME... "
    1.47 +		action 'Stopping %s: %s...' "$DESC" $NAME
    1.48  		kill $(cat $PIDFILE)
    1.49  		status
    1.50  		;;
    1.51  	restart)
    1.52  		if ! active_pidfile $PIDFILE sshd ; then
    1.53 -			echo "$NAME is not running."
    1.54 +			_ '%s is not running.' $NAME
    1.55  			exit 1
    1.56  		fi
    1.57 -		action "Restarting $DESC: $NAME... "
    1.58 +		action 'Restarting %s: %s...' "$DESC" $NAME
    1.59  		kill $(cat $PIDFILE)
    1.60  		sleep 2
    1.61  		$DAEMON $OPTIONS
    1.62  		status
    1.63  		;;
    1.64  	*)
    1.65 -		emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop|restart]"
    1.66 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    1.67  		newline
    1.68  		exit 1
    1.69  		;;