# HG changeset patch # User Aleksej Bobylev # Date 1551215662 -7200 # Node ID b77dd71871373397918d06077fa2c77c19092b36 # Parent 52fe2e3f497e342e65af127653bdfbdef8ebedc0 Tiny edits. diff -r 52fe2e3f497e -r b77dd7187137 boinc/stuff/boinc-client --- a/boinc/stuff/boinc-client Tue Feb 26 17:58:01 2019 +0100 +++ b/boinc/stuff/boinc-client Tue Feb 26 23:14:22 2019 +0200 @@ -342,20 +342,20 @@ status) PID=`cat $PIDFILE 2>/dev/null` - if [ "$PID" != "" ]; then + if [ -n "$PID" ]; then # is it still running? if [ -z "`${PS} $PID | grep $PID`" ]; then # not running. Try the other tests. PID="" fi fi - if [ "$PID" = "" ]; then + if [ -z "$PID" ]; then PID=`local_pidof $BOINCEXE_NAME` fi - if [ "$PID" = "" ]; then + if [ -z "$PID" ]; then PID=`local_pidof $BOINCEXE` fi - if [ "$PID" != "" ]; then + if [ -n "$PID" ]; then echo "BOINC client is running (pid $PID)." else if [ -f $BOINCDIR/lockfile -o -f $LOCKFILE ]; then diff -r 52fe2e3f497e -r b77dd7187137 make-slitaz-icons/stuff/mksit.sh --- a/make-slitaz-icons/stuff/mksit.sh Tue Feb 26 17:58:01 2019 +0100 +++ b/make-slitaz-icons/stuff/mksit.sh Tue Feb 26 23:14:22 2019 +0200 @@ -180,7 +180,7 @@ shift done -if [ "x$FROM" = "x" -o "x$TO" = "x" ]; then +if [ -z "$FROM" -o -z "$TO" ]; then echo "There are no required parameters (-f or -t)!"; exit 1 fi diff -r 52fe2e3f497e -r b77dd7187137 slim/stuff/slim-theme --- a/slim/stuff/slim-theme Tue Feb 26 17:58:01 2019 +0100 +++ b/slim/stuff/slim-theme Tue Feb 26 23:14:22 2019 +0200 @@ -44,7 +44,7 @@ { cd /usr/share/slim/themes theme=$(ls -Ad $1 2>/dev/null | head -n1) - [ x$theme = x ] && echo "Theme \"$1\" not exist!" >&2 && exit 1 + [ -z "$theme" ] && echo "Theme \"$1\" not exist!" >&2 && exit 1 echo $theme } i18n() diff -r 52fe2e3f497e -r b77dd7187137 tramys-server/stuff/tramys2.cgi --- a/tramys-server/stuff/tramys2.cgi Tue Feb 26 17:58:01 2019 +0100 +++ b/tramys-server/stuff/tramys2.cgi Tue Feb 26 23:14:22 2019 +0200 @@ -70,9 +70,9 @@ for line in $(grep -e "^$P " $DATADIR/$PREFIX$list_type.list); do locales=$(echo $line | cut -d' ' -f2) names=$(echo $line | cut -d' ' -f3) - [ "x$names" = "x" ] && names=$P + [ -z "$names" ] && names=$P paths=$(echo $line | cut -d' ' -f4) - [ "x$paths" = "x" ] && paths="$US/locale/%/$LC" + [ -z "$paths" ] && paths="$US/locale/%/$LC" IFS=' ' # for all valid locale variants diff -r 52fe2e3f497e -r b77dd7187137 tramys/stuff/tramys --- a/tramys/stuff/tramys Tue Feb 26 17:58:01 2019 +0100 +++ b/tramys/stuff/tramys Tue Feb 26 23:14:22 2019 +0200 @@ -73,9 +73,9 @@ for line in $(grep -e "^$P " $DATADIR/$list_type.list); do locales=$(echo $line | cut -d' ' -f2) names=$(echo $line | cut -d' ' -f3) - [ "x$names" = "x" ] && names=$P + [ -z "$names" ] && names=$P pathes=$(echo $line | cut -d' ' -f4) - [ "x$pathes" = "x" ] && pathes="$US/locale/%/$LC" + [ -z "$pathes" ] && pathes="$US/locale/%/$LC" IFS=' ' for locale in $MY_LOCALES; do diff -r 52fe2e3f497e -r b77dd7187137 turbine/stuff/turbine --- a/turbine/stuff/turbine Tue Feb 26 17:58:01 2019 +0100 +++ b/turbine/stuff/turbine Tue Feb 26 23:14:22 2019 +0200 @@ -49,7 +49,7 @@ checkROOT(){ user=$(id -u) -if [ "$user" = "0" ] +if [ "$user" -eq 0 ] then turbine else