wok rev 20904

Tiny edits.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Feb 26 23:14:22 2019 +0200 (2019-02-26)
parents 52fe2e3f497e
children 18c66805dd1a
files boinc/stuff/boinc-client make-slitaz-icons/stuff/mksit.sh slim/stuff/slim-theme tramys-server/stuff/tramys2.cgi tramys/stuff/tramys turbine/stuff/turbine
line diff
     1.1 --- a/boinc/stuff/boinc-client	Tue Feb 26 17:58:01 2019 +0100
     1.2 +++ b/boinc/stuff/boinc-client	Tue Feb 26 23:14:22 2019 +0200
     1.3 @@ -342,20 +342,20 @@
     1.4  
     1.5    status)
     1.6          PID=`cat $PIDFILE 2>/dev/null`
     1.7 -        if [ "$PID" != "" ]; then
     1.8 +        if [ -n "$PID" ]; then
     1.9            # is it still running?
    1.10            if [ -z "`${PS} $PID | grep $PID`" ]; then
    1.11              # not running.  Try the other tests.
    1.12              PID=""
    1.13            fi
    1.14          fi
    1.15 -        if [ "$PID" = "" ]; then
    1.16 +        if [ -z "$PID" ]; then
    1.17            PID=`local_pidof $BOINCEXE_NAME`
    1.18          fi
    1.19 -        if [ "$PID" = "" ]; then
    1.20 +        if [ -z "$PID" ]; then
    1.21            PID=`local_pidof $BOINCEXE`
    1.22          fi
    1.23 -        if [ "$PID" != "" ]; then
    1.24 +        if [ -n "$PID" ]; then
    1.25            echo "BOINC client is running (pid $PID)."
    1.26          else
    1.27            if [ -f $BOINCDIR/lockfile -o -f $LOCKFILE ]; then 
     2.1 --- a/make-slitaz-icons/stuff/mksit.sh	Tue Feb 26 17:58:01 2019 +0100
     2.2 +++ b/make-slitaz-icons/stuff/mksit.sh	Tue Feb 26 23:14:22 2019 +0200
     2.3 @@ -180,7 +180,7 @@
     2.4  	shift
     2.5  done
     2.6  
     2.7 -if [ "x$FROM" = "x" -o "x$TO" = "x" ]; then
     2.8 +if [ -z "$FROM" -o -z "$TO" ]; then
     2.9  	echo "There are no required parameters (-f or -t)!"; exit 1
    2.10  fi
    2.11  
     3.1 --- a/slim/stuff/slim-theme	Tue Feb 26 17:58:01 2019 +0100
     3.2 +++ b/slim/stuff/slim-theme	Tue Feb 26 23:14:22 2019 +0200
     3.3 @@ -44,7 +44,7 @@
     3.4  {
     3.5  	cd /usr/share/slim/themes
     3.6  	theme=$(ls -Ad $1 2>/dev/null | head -n1)
     3.7 -	[ x$theme = x ] && echo "Theme \"$1\" not exist!" >&2 && exit 1
     3.8 +	[ -z "$theme" ] && echo "Theme \"$1\" not exist!" >&2 && exit 1
     3.9  	echo $theme
    3.10  }
    3.11  i18n()
     4.1 --- a/tramys-server/stuff/tramys2.cgi	Tue Feb 26 17:58:01 2019 +0100
     4.2 +++ b/tramys-server/stuff/tramys2.cgi	Tue Feb 26 23:14:22 2019 +0200
     4.3 @@ -70,9 +70,9 @@
     4.4  			for line in $(grep -e "^$P	" $DATADIR/$PREFIX$list_type.list); do
     4.5  				locales=$(echo $line | cut -d'	' -f2)
     4.6  				names=$(echo $line | cut -d'	' -f3)
     4.7 -					[ "x$names" = "x" ] && names=$P
     4.8 +					[ -z "$names" ] && names=$P
     4.9  				paths=$(echo $line | cut -d'	' -f4)
    4.10 -					[ "x$paths" = "x" ] && paths="$US/locale/%/$LC"
    4.11 +					[ -z "$paths" ] && paths="$US/locale/%/$LC"
    4.12  
    4.13  				IFS=' '
    4.14  				# for all valid locale variants
     5.1 --- a/tramys/stuff/tramys	Tue Feb 26 17:58:01 2019 +0100
     5.2 +++ b/tramys/stuff/tramys	Tue Feb 26 23:14:22 2019 +0200
     5.3 @@ -73,9 +73,9 @@
     5.4  			for line in $(grep -e "^$P	" $DATADIR/$list_type.list); do
     5.5  				locales=$(echo $line | cut -d'	' -f2)
     5.6  				names=$(echo $line | cut -d'	' -f3)
     5.7 -					[ "x$names" = "x" ] && names=$P
     5.8 +					[ -z "$names" ] && names=$P
     5.9  				pathes=$(echo $line | cut -d'	' -f4)
    5.10 -					[ "x$pathes" = "x" ] && pathes="$US/locale/%/$LC"
    5.11 +					[ -z "$pathes" ] && pathes="$US/locale/%/$LC"
    5.12  
    5.13  				IFS=' '
    5.14  				for locale in $MY_LOCALES; do
     6.1 --- a/turbine/stuff/turbine	Tue Feb 26 17:58:01 2019 +0100
     6.2 +++ b/turbine/stuff/turbine	Tue Feb 26 23:14:22 2019 +0200
     6.3 @@ -49,7 +49,7 @@
     6.4  checkROOT(){
     6.5  
     6.6  user=$(id -u)
     6.7 -if [ "$user" = "0" ]
     6.8 +if [ "$user" -eq 0 ]
     6.9  then
    6.10    turbine
    6.11  else