# HG changeset patch # User Pascal Bellard # Date 1551165829 -3600 # Node ID a6b28f1e53eb21932ff524883d969bf8beed65a2 # Parent 930eba358f72cc0b21441795a15a31c43cc9c01e Remove ashism == diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/rootfs/home/backups/mirror/backup.sh --- a/mirror-tools/rootfs/home/backups/mirror/backup.sh Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/rootfs/home/backups/mirror/backup.sh Tue Feb 26 08:23:49 2019 +0100 @@ -34,9 +34,9 @@ SSH="ssh -i /home/$BACKUP_USER/.ssh/id_rsa -o PasswordAuthentication=no" cd $(dirname $0) -[ $(id -u) == 0 ] || exit 1 -[ $(hostname) == $(basename $PWD) -o \ - $(hostname) == $(basename $PWD).slitaz.org ] || exit 1 +[ $(id -u) = 0 ] || exit 1 +[ $(hostname) = $(basename $PWD) -o \ + $(hostname) = $(basename $PWD).slitaz.org ] || exit 1 rotate() { @@ -77,7 +77,7 @@ chmod 700 * [ -n "$REMOTE_USER" ] && for i in $(cd .. ; ls); do - [ $i == $(hostname) -o $i.slitaz.org == $(hostname) ] && continue + [ $i = $(hostname) -o $i.slitaz.org = $(hostname) ] && continue echo "Getting backups from $i ..." rsync -aH -e "$SSH" --bwlimit=50 $REMOTE_USER@$i.slitaz.org:/home/backups/$i/. ../$i/. done diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/rootfs/usr/bin/mkpkgiso --- a/mirror-tools/rootfs/usr/bin/mkpkgiso Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/rootfs/usr/bin/mkpkgiso Tue Feb 26 08:23:49 2019 +0100 @@ -50,7 +50,7 @@ fi # Update hg repos -if [ "$PKG_VER" == "update-hg" ]; then +if [ "$PKG_VER" = "update-hg" ]; then for repos in $@ ; do for i in $repos/* ; do grep -qs '\[paths]' $i/.hg/hgrc || continue @@ -147,7 +147,7 @@ DIR=\$(cd \$(busybox dirname \$0); pwd) # Handle --auto-install case -if [ "\$DIR" == "/etc/init.d" ]; then +if [ "\$DIR" = "/etc/init.d" ]; then DIR=/cdrom if [ ! -f /cdrom/install.sh ]; then mkdir /cdrom 2> /dev/null @@ -357,7 +357,7 @@ need $iso which isoinfo > /dev/null || need /usr/bin/isoinfo isoinfo -R -l -i $iso | awk '/^Directory/ { path=$4 } /^-/ { print path$12 }' | while read file; do - [ "$(basename $file)" == ".." ] && continue + [ "$(basename $file)" = ".." ] && continue [ "$file" = "/boot/isolinux/boot.cat" ] && continue [ -d "$(dirname $TEMP_DIR/$file)" ] || mkdir -p "$(dirname $TEMP_DIR/$file)" diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/rootfs/usr/sbin/srvwatch --- a/mirror-tools/rootfs/usr/sbin/srvwatch Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/rootfs/usr/sbin/srvwatch Tue Feb 26 08:23:49 2019 +0100 @@ -107,7 +107,7 @@ log "start daemon $command" /etc/init.d/$command start } - if [ $command == mysql -a ! -e /var/run/mysqld/mysqld.sock ]; then + if [ $command = mysql -a ! -e /var/run/mysqld/mysqld.sock ]; then log "mysql socket" killall mysqld killall -9 mysqld @@ -156,7 +156,7 @@ case "$1" in install) - [ $0 == $2/usr/sbin/srvwatch ] || mv $0 $2/usr/sbin/srvwatch + [ $0 = $2/usr/sbin/srvwatch ] || mv $0 $2/usr/sbin/srvwatch if [ -x $2/usr/sbin/srvwatch ] && ! grep -q /usr/sbin/srvwatch $2/etc/inittab; then sed -i 's|^::sysinit.*|&\n::respawn:/usr/sbin/srvwatch loop|' \ $2/etc/inittab diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/rootfs/usr/share/mirror-host/boot/shellinabox.sh --- a/mirror-tools/rootfs/usr/share/mirror-host/boot/shellinabox.sh Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/rootfs/usr/share/mirror-host/boot/shellinabox.sh Tue Feb 26 08:23:49 2019 +0100 @@ -64,11 +64,11 @@ auth() { while read host md5 ; do - [ "${host#*.}" == "${1#*.}" ] && break + [ "${host#*.}" = "${1#*.}" ] && break done < $(dirname $exe)/shellinabox.secrets echo -n "$host password: " read -s -t 30 password || exit 1 - [ "$(echo $password | md5sum)" == "$md5 -" ] || exit 1 + [ "$(echo $password | md5sum)" = "$md5 -" ] || exit 1 echo "" } diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/rootfs/usr/share/rrd/makegraphs --- a/mirror-tools/rootfs/usr/share/rrd/makegraphs Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/rootfs/usr/share/rrd/makegraphs Tue Feb 26 08:23:49 2019 +0100 @@ -144,7 +144,7 @@ updatediskgraph() { period=$1 - [ "$period" == "day" ] && maxdisk="$(getmax disk)" + [ "$period" = "day" ] && maxdisk="$(getmax disk)" info="" [ -r $2 ] && info="[ $(fdisk -l | grep "^Disk $2:" | \ @@ -198,7 +198,7 @@ updateifgraph() { interface=$1 period=$2 - [ "$period" == "day" ] && maxif="$(getmax $interface)" + [ "$period" = "day" ] && maxif="$(getmax $interface)" rrdtool graph "$rrdgraph/$interface-$period.png" --start -1$period \ $rrdgraphargs -t "traffic on $interface graph per $period" \ --logarithmic -A -v "Bytes/second" --units=si \ @@ -260,7 +260,7 @@ local i d=$(stat -c %D $1) for i in /dev/* ; do - [ $(stat -c "%02t%02T" $i) == $d ] || continue + [ $(stat -c "%02t%02T" $i) = $d ] || continue echo $i break done diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/slitaz/mirror/floppies/builder/bootloader --- a/mirror-tools/slitaz/mirror/floppies/builder/bootloader Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/slitaz/mirror/floppies/builder/bootloader Tue Feb 26 08:23:49 2019 +0100 @@ -110,7 +110,7 @@ ddq bs=16 count=$syssz >>kernel [ $(($syssz % 32)) -ne 0 ] && ddq bs=16 of=/dev/null count=$((32 - ($syssz % 32))) - if [ $(get $Magic kernel 4) == 1400005704 ]; then + if [ $(get $Magic kernel 4) = 1400005704 ]; then ddq bs=1 count=200 skip=$((512+$(get 0x20E kernel 2))) \ if=kernel | strings | sed q len=$(get $RamfsLenOfs kernel 4) @@ -379,7 +379,7 @@ rm -f $bs } -if [ "$FORMAT" == "0" ]; then # unsplitted +if [ "$FORMAT" = "0" ]; then # unsplitted floppyset > $PREFIX PAD=$(( 512 - ($(stat -c %s $PREFIX) % 512) )) [ $PAD -ne 512 ] && ddq if=/dev/zero bs=1 count=$PAD >> $PREFIX diff -r 930eba358f72 -r a6b28f1e53eb mirror-tools/slitaz/mirror/floppies/mkfdrolling.sh --- a/mirror-tools/slitaz/mirror/floppies/mkfdrolling.sh Fri May 18 15:57:37 2018 +0200 +++ b/mirror-tools/slitaz/mirror/floppies/mkfdrolling.sh Tue Feb 26 08:23:49 2019 +0100 @@ -45,7 +45,7 @@ awk "/fd$(($i+1))/{q=1}{if(!q)n++}END{print n}") floppies: fd001.img to $(ls -r fd${i}* | sed q).
$flavor provides $(while read f d; do - [ $f == $flavor ] && echo $d; done <stable diff -r 930eba358f72 -r a6b28f1e53eb taztpd/taztpd --- a/taztpd/taztpd Fri May 18 15:57:37 2018 +0200 +++ b/taztpd/taztpd Tue Feb 26 08:23:49 2019 +0100 @@ -97,7 +97,7 @@ read request while /bin/true; do read header - [ "$header" == $'\r' ] && break; + [ "$header" = $'\r' ] && break; done # Extract URL from the request string url="${request#GET }" diff -r 930eba358f72 -r a6b28f1e53eb tazwikiss/rootfs/var/www/wiki/index.sh --- a/tazwikiss/rootfs/var/www/wiki/index.sh Fri May 18 15:57:37 2018 +0200 +++ b/tazwikiss/rootfs/var/www/wiki/index.sh Tue Feb 26 08:23:49 2019 +0100 @@ -46,7 +46,7 @@ { local tmp tmp="$(echo $1$(date +%d) | md5sum | cut -c1-8)" - [ "$(POST sc)" == "$1" ] && AUTH=$tmp || [ "$AUTH" == "$tmp" ] + [ "$(POST sc)" = "$1" ] && AUTH=$tmp || [ "$AUTH" = "$tmp" ] } authentified() @@ -76,7 +76,7 @@ grep -q "^$name()" $i || continue . $i eval $name "$@" - [ $? == 0 ] && status=true + [ $? = 0 ] && status=true done 2> /tmp/tazwiki$$stderr [ -s /tmp/tazwiki$$stderr ] && logger -t "httpd/wiki/plugin" < /tmp/tazwiki$$stderr @@ -153,7 +153,7 @@ CONTENT="$(cat "$PAGE_txt")" fi # Restaurer une page - [ -n "$(GET page)" -a -n "$gtime" -a "$(GET restore)" == 1 ] && + [ -n "$(GET page)" -a -n "$gtime" -a "$(GET restore)" = 1 ] && [ -r "$BACKUP_DIR$PAGE_TITLE/$gtime" ] && CONTENT="$(cat $BACKUP_DIR$PAGE_TITLE/$gtime)" CONTENT="$(sed -e 's/\$/\$/g' -e 's/\\/\\/g' <$RECENT_CHANGES" -[ "$action" == "recent" ] && RECENT=$RECENT_CHANGES +[ "$action" = "recent" ] && RECENT=$RECENT_CHANGES HOME="$HOME_BUTTON" -[ "$PAGE_TITLE" == "$START_PAGE" -a "$action" != "search" ] && HOME=$HOME_BUTTON +[ "$PAGE_TITLE" = "$START_PAGE" -a "$action" != "search" ] && HOME=$HOME_BUTTON HELP="\1$HELP_BUTTON\2" [ "$action" != "edit" ] && HELP="" diff -r 930eba358f72 -r a6b28f1e53eb tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh Fri May 18 15:57:37 2018 +0200 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh Tue Feb 26 08:23:49 2019 +0100 @@ -46,7 +46,7 @@ secret="admin.secret" if [ -n "$(POST setpass)" ]; then if [ -z "$curpass" ]; then # unauthorized - if [ ! -s $secret -o "$(cat $secret 2> /dev/null)" == \ + if [ ! -s $secret -o "$(cat $secret 2> /dev/null)" = \ "$(echo $(POST password) | md5sum)" ]; then curpass="$(POST password)" fi diff -r 930eba358f72 -r a6b28f1e53eb tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Fri May 18 15:57:37 2018 +0200 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Password.sh Tue Feb 26 08:23:49 2019 +0100 @@ -15,7 +15,7 @@ esac hash="$(sed '/{HASHPASSWORD=.*}/!d;s/.*{HASHPASSWORD=\([^}]*\)}.*/\1/;q' <$1)" cookie="pagepass$(pagepass_hash $PWD$PAGE_txt)" - [ "$(COOKIE $cookie)" == "$hash" ] && return + [ "$(COOKIE $cookie)" = "$hash" ] && return header echo "" exit 0 @@ -24,9 +24,9 @@ action() { - [ "$1" == "pagepass" ] || return 1 + [ "$1" = "pagepass" ] || return 1 uri="$SCRIPT_NAME?page=$(POST page)&auth=$(POST auth)" - if [ "$(pagepass_hash $(POST pass))" == "$(POST hash)" ]; then + if [ "$(pagepass_hash $(POST pass))" = "$(POST hash)" ]; then header "HTTP/1.0 302 Found" \ "location: $uri" \ "Set-Cookie: $(POST cookie)=$(POST hash)" diff -r 930eba358f72 -r a6b28f1e53eb tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh Fri May 18 15:57:37 2018 +0200 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh Tue Feb 26 08:23:49 2019 +0100 @@ -63,7 +63,7 @@ ls pages/data | while read file; do stat -c "%s %n" pages/data/$file done | while read size file; do - [ $filesize == $size ] && + [ $filesize = $size ] && cmp $(FILE file tmpname) $file > /dev/null && ln -s $(basename $file) pages/data/$n$name && break done