SliTaz Repositories

     1.1 --- a/tazpanel	Wed Dec 17 20:13:19 2014 +0200
     1.2 +++ b/tazpanel	Tue Mar 24 03:39:08 2015 +0200
     1.3 @@ -2,11 +2,13 @@
     1.4  #
     1.5  # Tiny Tazpanel cmdline interface
     1.6  #
     1.7 -# Copyright (C) 2012-2014 SliTaz GNU/Linux - BSD License
     1.8 +# Copyright (C) 2012-2015 SliTaz GNU/Linux - BSD License
     1.9  #
    1.10  VERSION=1.8.2
    1.11  
    1.12 +
    1.13  # Get the configuration file and functions
    1.14 +
    1.15  CONFIG="/etc/slitaz/tazpanel.conf"
    1.16  [ -f "$CONFIG" ] && . $CONFIG
    1.17  [ -f "data/tazpanel.conf" ] && . data/tazpanel.conf
    1.18 @@ -14,10 +16,13 @@
    1.19  
    1.20  . /lib/libtaz.sh
    1.21  
    1.22 +
    1.23  # I18n
    1.24 +
    1.25  TEXTDOMAIN='tazpanel'
    1.26  export TEXTDOMAIN
    1.27  
    1.28 +
    1.29  #
    1.30  # Commands
    1.31  #
    1.32 @@ -29,12 +34,12 @@
    1.33  
    1.34  case "$1" in
    1.35  	-h|*help|*usage)
    1.36 -		echo ""
    1.37 +		echo
    1.38  		gettext 'Usage: tazpanel [start|stop|passwd|app]'; echo
    1.39 -		echo "" ;;
    1.40 -	start)  
    1.41 +		echo ;;
    1.42 +	start)
    1.43  		if [ -f $PIDFILE ]; then
    1.44 -	        gettext 'TazPanel is already running.'; echo
    1.45 +			gettext 'TazPanel is already running.'; echo
    1.46  			exit 1
    1.47  		fi
    1.48  		eval_gettext 'Starting TazPanel web server on port $HTTPD_PORT...'
    1.49 @@ -43,27 +48,27 @@
    1.50  		ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \
    1.51  			awk '{ print $1 }' > $PIDFILE
    1.52  		status ;;
    1.53 -	stop)   
    1.54 -	        if [ ! -f $PIDFILE ]; then
    1.55 -	        gettext 'TazPanel is not running.'; echo
    1.56 -	        exit 1
    1.57 -	        fi
    1.58 +	stop)
    1.59 +		if [ ! -f $PIDFILE ]; then
    1.60 +			gettext 'TazPanel is not running.'; echo
    1.61 +			exit 1
    1.62 +		fi
    1.63  		gettext 'Stopping TazPanel web server...'
    1.64 -		kill $(pgrep -f TazPanel) 
    1.65 +		kill $(pgrep -f TazPanel)
    1.66  		rm -f $PIDFILE
    1.67  		status ;;
    1.68  	passwd|-p)
    1.69 -		echo ""
    1.70 +		echo
    1.71  		gettext 'Changing password for TazPanel'; echo
    1.72  		gettext 'New password: ' && read pass
    1.73 -		sed -i s"/\/:root:.*/\/:root:$pass/" $HTTPD_CONF
    1.74 +		sed -i "s/\/:root:.*/\/:root:$pass/" $HTTPD_CONF
    1.75  		gettext 'Password changed successfully'; echo
    1.76 -		echo "" ;;
    1.77 +		echo ;;
    1.78  	*)
    1.79  		. /etc/slitaz/applications.conf
    1.80  		USER_CONFIG="$HOME/.config/slitaz/applications.conf"
    1.81 -		[ -f  "$USER_CONFIG" ] && . $USER_CONFIG
    1.82 -		[ "$1" ] && app="/${1}.cgi"
    1.83 +		[ -f "$USER_CONFIG" ] && . $USER_CONFIG
    1.84 +		[ -n "$1" ] && app="/${1}.cgi"
    1.85  		echo http://localhost:82${app}
    1.86  		case "$BROWSER" in
    1.87  			tazweb) tazweb --notoolbar http://localhost:82${app} & ;;