# HG changeset patch # User Pascal Bellard # Date 1551168847 -3600 # Node ID 02c70d036ea008d7f24def875012aa2cab086a2d # Parent 87d7af51ba68ee7716173117aa1b304d7af06d75 Remove ashism == diff -r 87d7af51ba68 -r 02c70d036ea0 ajaxterm/stuff/usr/share/ajaxterm/login --- a/ajaxterm/stuff/usr/share/ajaxterm/login Tue Feb 26 08:20:18 2019 +0100 +++ b/ajaxterm/stuff/usr/share/ajaxterm/login Tue Feb 26 09:14:07 2019 +0100 @@ -12,7 +12,7 @@ done < $file echo -n "$ask_question " read -t 30 answer - [ $ask_md5 == $(echo $answer | md5sum | cut -d\ -f1) ] || exit 1 + [ $ask_md5 = $(echo $answer | md5sum | cut -d\ -f1) ] || exit 1 fi # Get SSH server diff -r 87d7af51ba68 -r 02c70d036ea0 boinc/receipt --- a/boinc/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/boinc/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -70,7 +70,7 @@ echo echo -n "Delete user boinc and /var/lib/boinc (yes/No) ? : " read -t 30 answer - if [ "$answer" == "yes" ]; then + if [ "$answer" = "yes" ]; then chroot "$1/" deluser boinc rm -r "$1/var/lib/boinc" else diff -r 87d7af51ba68 -r 02c70d036ea0 boinc/stuff/boinc-client --- a/boinc/stuff/boinc-client Tue Feb 26 08:20:18 2019 +0100 +++ b/boinc/stuff/boinc-client Tue Feb 26 09:14:07 2019 +0100 @@ -349,10 +349,10 @@ PID="" fi fi - if [ "$PID" == "" ]; then + if [ "$PID" = "" ]; then PID=`local_pidof $BOINCEXE_NAME` fi - if [ "$PID" == "" ]; then + if [ "$PID" = "" ]; then PID=`local_pidof $BOINCEXE` fi if [ "$PID" != "" ]; then diff -r 87d7af51ba68 -r 02c70d036ea0 busybox/stuff/httpd_helper.sh --- a/busybox/stuff/httpd_helper.sh Tue Feb 26 08:20:18 2019 +0100 +++ b/busybox/stuff/httpd_helper.sh Tue Feb 26 09:14:07 2019 +0100 @@ -111,7 +111,7 @@ dd bs=1 count=$(($count - ($tmp * $page) )) } -if [ "$REQUEST_METHOD$POST__NAMES" == "POST" ]; then +if [ "$REQUEST_METHOD$POST__NAMES" = "POST" ]; then prefix=/tmp/httpd_post mkdir $prefix$$ now=$(stat -c %Y $prefix$$) diff -r 87d7af51ba68 -r 02c70d036ea0 busybox/stuff/udhcp.script --- a/busybox/stuff/udhcp.script Tue Feb 26 08:20:18 2019 +0100 +++ b/busybox/stuff/udhcp.script Tue Feb 26 09:14:07 2019 +0100 @@ -4,7 +4,7 @@ [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 -[ "$subnet" == "255.255.255.255" ] && subnet="255.255.0.0" # qemu/ipv6 weirdness +[ "$subnet" = "255.255.255.255" ] && subnet="255.255.0.0" # qemu/ipv6 weirdness RESOLV_CONF="/etc/resolv.conf" [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" [ -n "$subnet" ] && NETMASK="netmask $subnet" @@ -36,7 +36,7 @@ renew|bound) ipv6mask=${ipv6prefix#*/} ip=${ip:-$ipv6} - if [ ${ip/:/} == $ip ]; then + if [ ${ip/:/} = $ip ]; then ifconfig $interface $ip $BROADCAST $NETMASK v6="" else @@ -57,7 +57,7 @@ for i in $dns ; do echo nameserver $i done >> $RESOLV_CONF - if [ "$1" == "bound" ] ; then + if [ "$1" = "bound" ] ; then [ -n "$tz" ] && echo $tz > /etc/TZ for i in /etc/ipup.d/*; do [ -x $i ] && $i $interface $ip $dns diff -r 87d7af51ba68 -r 02c70d036ea0 dmraid/stuff/grub-dmraid --- a/dmraid/stuff/grub-dmraid Tue Feb 26 08:20:18 2019 +0100 +++ b/dmraid/stuff/grub-dmraid Tue Feb 26 09:14:07 2019 +0100 @@ -12,7 +12,7 @@ # Get raid parameters dev=/dev/mapper/$(dmraid -s 2> /dev/null | grep ^name | awk '{ print $3 }') -if [ "$dev" == "/dev/mapper/" ]; then +if [ "$dev" = "/dev/mapper/" ]; then echo "No dmraid device found." 1>&2 exit 1 fi diff -r 87d7af51ba68 -r 02c70d036ea0 dropbear/stuff/sshx --- a/dropbear/stuff/sshx Tue Feb 26 08:20:18 2019 +0100 +++ b/dropbear/stuff/sshx Tue Feb 26 09:14:07 2019 +0100 @@ -53,7 +53,7 @@ pppsvr="$ppp $n ${3:-proxyarp} notty >/dev/null" sshcmd="nc -ulp $5 -e $pppsvr" udpcmd="nc -u $ipsvr $5" - [ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc 127.0.0.1 22" && + [ "$6" = "test" ] && sshcmd="nc -ulp $5 -e nc 127.0.0.1 22" && udpcmd="dbclient -y -J \"nc -u $ipsvr $5\" ${1%@*}@127.0.0.1 $pppsvr" [ -n "$5" ] && arg="noipdefault pty '$udpcmd'" && $ssh -f ${1/:/ -p } "$sshcmd" eval $ppp $arg ipparam pppssh$$ @@ -66,7 +66,7 @@ p=5900 while netstat -tln | grep -q ":$p " ; do p=$(($p+1)); done [ -r /dev/input/mice ] || echo "Warning: Cannot read mouse input." 1>&2 - r=${1%/*}; svr=${1#*/}; [ "$svr" == "$1" ] && svr=127.0.0.1 + r=${1%/*}; svr=${1#*/}; [ "$svr" = "$1" ] && svr=127.0.0.1 dbclient -y -f -N -L $p:$svr:${2:-5900} ${r/:/ -p } fbvnc 127.0.0.1 $p kill $(netstat -tlnp 2> /dev/null | \ diff -r 87d7af51ba68 -r 02c70d036ea0 gcc/receipt --- a/gcc/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/gcc/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -34,8 +34,8 @@ { # Package slitaz-toolchain use 'cook --options' when rebuilding # the full SliTaz toolchain. - [ "$2" == "--first-pass" ] && opt=$2 - [ "$3" == "--first-pass" ] && opt=$3 + [ "$2" = "--first-pass" ] && opt=$2 + [ "$3" = "--first-pass" ] && opt=$3 # Use libiberty.a from binutils. sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in || return 1 diff -r 87d7af51ba68 -r 02c70d036ea0 get-opera-blink/stuff/get-opera-blink --- a/get-opera-blink/stuff/get-opera-blink Tue Feb 26 08:20:18 2019 +0100 +++ b/get-opera-blink/stuff/get-opera-blink Tue Feb 26 09:14:07 2019 +0100 @@ -8,7 +8,7 @@ . /lib/libtaz.sh -while [ "${1:0:2}" == '--' ]; do shift; done +while [ "${1:0:2}" = '--' ]; do shift; done VERSION="$1" check_root diff -r 87d7af51ba68 -r 02c70d036ea0 get-wfica/stuff/get-wfica --- a/get-wfica/stuff/get-wfica Tue Feb 26 08:20:18 2019 +0100 +++ b/get-wfica/stuff/get-wfica Tue Feb 26 09:14:07 2019 +0100 @@ -89,7 +89,7 @@ ln -s $ICAROOT/wfica usr/bin ln -s $ICAROOT/wfcmgr usr/bin -if [ "$INSTALL_USB" == "yes" ]; then +if [ "$INSTALL_USB" = "yes" ]; then wget -O .$ICAROOT/ctxusb.deb "$USB_URL" dpkg-deb -x .$ICAROOT/ctxusb*.deb . chmod 500 .$ICAROOT/ctxusbd diff -r 87d7af51ba68 -r 02c70d036ea0 get-wifi-firmware/stuff/get-wifi-firmware --- a/get-wifi-firmware/stuff/get-wifi-firmware Tue Feb 26 08:20:18 2019 +0100 +++ b/get-wifi-firmware/stuff/get-wifi-firmware Tue Feb 26 09:14:07 2019 +0100 @@ -8,7 +8,7 @@ MODULE_LIST="" while read module desc ; do - [ "$MODULE" == "$module" ] && desc="$SHORT_DESC" + [ "$MODULE" = "$module" ] && desc="$SHORT_DESC" MODULE_LIST="$MODULE_LIST $module" done < $MD5FILE # substitute repeated files by symlinks diff -r 87d7af51ba68 -r 02c70d036ea0 mosh/receipt --- a/mosh/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/mosh/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -49,7 +49,7 @@ EOT echo -n "Add -a for DROPBEAR_OPTIONS in /etc/daemons.conf now ?" read -t 30 answer - [ "$answer" == "y" ] && + [ "$answer" = "y" ] && sed -i 's/^DROPBEAR_OPTIONS="/&-a /' "$1/etc/daemons.conf" && [ -z "$1" ] && /etc/init.d/dropbear restart fi diff -r 87d7af51ba68 -r 02c70d036ea0 nail/receipt --- a/nail/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/nail/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -53,7 +53,7 @@ echo "/usr/bin/mailx exists" echo -n "Do you want /usr/bin/nail for /usr/bin/mailx (y/N) ? : " read -t 30 anser - if [ "$anser" == "y" ]; then + if [ "$anser" = "y" ]; then echo "" echo -n "linking /usr/bin/mailx to /usr/bin/nail" rm "$1/usr/bin/mailx" diff -r 87d7af51ba68 -r 02c70d036ea0 netatalk-pam/stuff/etc/init.d/netatalk --- a/netatalk-pam/stuff/etc/init.d/netatalk Tue Feb 26 08:20:18 2019 +0100 +++ b/netatalk-pam/stuff/etc/init.d/netatalk Tue Feb 26 09:14:07 2019 +0100 @@ -22,7 +22,7 @@ # Start Netatalk servers. atalk_startup() { - if [ "$ATALKD_RUN" == "yes" ]; then + if [ "$ATALKD_RUN" = "yes" ]; then modprobe appletalk atalkd pidof atalkd > $PIDFILE @@ -31,11 +31,11 @@ nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE" nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE" - [ "$PAPD_RUN" == "yes" ] && papd - [ "$TIMELORD_RUN" == "yes" ] && timelord + [ "$PAPD_RUN" = "yes" ] && papd + [ "$TIMELORD_RUN" = "yes" ] && timelord fi - [ "$AFPD_RUN" == "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ + [ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ -c $AFPD_MAX_CLIENTS -n "$ATALK_NAME$ATALK_ZONE" } @@ -46,7 +46,7 @@ exit 1 fi action 'Starting %s: %s...' "$DESC" $NAME - if [ "$ATALK_BGROUND" == "yes" ]; then + if [ "$ATALK_BGROUND" = "yes" ]; then atalk_startup >/dev/null & else atalk_startup diff -r 87d7af51ba68 -r 02c70d036ea0 netatalk/stuff/etc/init.d/netatalk --- a/netatalk/stuff/etc/init.d/netatalk Tue Feb 26 08:20:18 2019 +0100 +++ b/netatalk/stuff/etc/init.d/netatalk Tue Feb 26 09:14:07 2019 +0100 @@ -22,7 +22,7 @@ # Start Netatalk servers. atalk_startup() { - if [ "$ATALKD_RUN" == "yes" ]; then + if [ "$ATALKD_RUN" = "yes" ]; then modprobe appletalk atalkd pidof atalkd > $PIDFILE @@ -31,8 +31,8 @@ nbprgstr -p 4 "$ATALK_NAME:Workstation$ATALK_ZONE" nbprgstr -p 4 "$ATALK_NAME:netatalk$ATALK_ZONE" - [ "$PAPD_RUN" == "yes" ] && papd - [ "$TIMELORD_RUN" == "yes" ] && timelord + [ "$PAPD_RUN" = "yes" ] && papd + [ "$TIMELORD_RUN" = "yes" ] && timelord fi [ "$AFPD_RUN" = "yes" ] && afpd $AFPD_UAMLIST -g $AFPD_GUEST \ @@ -46,7 +46,7 @@ exit 1 fi action 'Starting %s: %s...' "$DESC" $NAME - if [ "$ATALK_BGROUND" == "yes" ]; then + if [ "$ATALK_BGROUND" = "yes" ]; then atalk_startup >/dev/null & else atalk_startup diff -r 87d7af51ba68 -r 02c70d036ea0 ntpclient/receipt --- a/ntpclient/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/ntpclient/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -31,7 +31,7 @@ [ -n "$1" -o -n "$quiet" ] && return echo -en '\nDo you want to run ntpclient in automatic mode (y/N): ' read -t 30 anser - if [ "$anser" == 'y' ]; then + if [ "$anser" = 'y' ]; then srv='fr.pool.ntp.org' action 'Setting up crontab for ntpclient...' crontab -l 2>/dev/null | grep -q '/usr/bin/ntpclient -s -h' || diff -r 87d7af51ba68 -r 02c70d036ea0 nvidia-173xx/receipt --- a/nvidia-173xx/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/nvidia-173xx/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -105,13 +105,13 @@ echo "For installing this package, you have to accept the $PACKAGE license." echo "The license is stored in /usr/share/licenses/$PACKAGE " echo -n "Would you like to read the license (y/N) : "; read anser - if [ "$anser" == 'y' ]; then + if [ "$anser" = 'y' ]; then more "$1/usr/share/licenses/$PACKAGE/LICENSE" newline fi separator echo -n 'Do you accept the license (y/N) : '; read anser - if [ "$anser" == 'N' ]; then + if [ "$anser" = 'N' ]; then echo 'You did not accept the license, Removing the pkg.' tazpkg remove "$PACKAGE" fi diff -r 87d7af51ba68 -r 02c70d036ea0 nvidia-96xx/receipt --- a/nvidia-96xx/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/nvidia-96xx/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -89,13 +89,13 @@ echo "For installing this package, you have to accept the $PACKAGE license." echo "The license is stored in /usr/share/licenses/$PACKAGE " echo -n "Would you like to read the license (y/N) : "; read anser - if [ "$anser" == 'y' ]; then + if [ "$anser" = 'y' ]; then more /usr/share/licenses/"$PACKAGE"/LICENSE echo fi separator echo -n "Do you accept the license (y/N) : "; read anser - if [ "$anser" == 'N' ]; then + if [ "$anser" = 'N' ]; then echo "You did not accept the license, Removing the pkg." tazpkg remove "$PACKAGE" fi diff -r 87d7af51ba68 -r 02c70d036ea0 sdcc/receipt --- a/sdcc/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/sdcc/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -17,7 +17,7 @@ compile_rules() { cd $src - sed -i 's/exec/[ "$1" == ":" ] || &/' device/lib/pic16/depcomp + sed -i 's/exec/[ "$1" = ":" ] || &/' device/lib/pic16/depcomp sed -i 's/ -u$//' device/lib/Makefile* ./configure --prefix=/usr --infodir=/usr/share/info \ diff -r 87d7af51ba68 -r 02c70d036ea0 shutdown/stuff/shutdown --- a/shutdown/stuff/shutdown Tue Feb 26 08:20:18 2019 +0100 +++ b/shutdown/stuff/shutdown Tue Feb 26 09:14:07 2019 +0100 @@ -5,7 +5,7 @@ # use 'shutdown -r now' or similar. # -if [ "x$1" == "x-r" ]; then +if [ "x$1" = "x-r" ]; then /sbin/reboot else /sbin/poweroff diff -r 87d7af51ba68 -r 02c70d036ea0 slim/stuff/slim-theme --- a/slim/stuff/slim-theme Tue Feb 26 08:20:18 2019 +0100 +++ b/slim/stuff/slim-theme Tue Feb 26 09:14:07 2019 +0100 @@ -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 + [ x$theme = x ] && echo "Theme \"$1\" not exist!" >&2 && exit 1 echo $theme } i18n() @@ -89,9 +89,9 @@ curr=$(get_current) prev=$(get_prev) echo "Forget theme \"$theme\"" >&2 - if [ x$theme == x$curr ]; then - last=$(echo $prev | cut -d: -f1); [ x$last == x ] && last=base - rest=${prev#*:}; [ x$rest == x$prev ] && rest= + if [ x$theme = x$curr ]; then + last=$(echo $prev | cut -d: -f1); [ x$last = x ] && last=base + rest=${prev#*:}; [ x$rest = x$prev ] && rest= prev=$rest; set_prev $prev echo "Back to \"$last\" theme" >&2 set_current $last @@ -124,7 +124,7 @@ T) i18n $OPTARG; exit 0 ;; *) - if [ x$OPTARG == xs -o x$OPTARG == xf -o x$OPTARG == xT ]; then + if [ x$OPTARG = xs -o x$OPTARG = xf -o x$OPTARG = xT ]; then echo "Option \"$OPTARG\" requires an argument." else [ x$OPTARG != x ] && echo "Illegal option \"$OPTARG\"." diff -r 87d7af51ba68 -r 02c70d036ea0 syslinux/receipt --- a/syslinux/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/syslinux/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -38,7 +38,7 @@ sed -i 's/loadkeys -m/loadkeys -u -m/' utils/keytab-lilo # for ru.kbd mkdir kbd for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do - [ "$(basename $(dirname $i))" == 'include' ] && continue + [ "$(basename $(dirname $i))" = 'include' ] && continue utils/keytab-lilo /usr/share/kbd/keymaps/i386/qwerty/us.map.gz \ $i > kbd/$(basename $i .map.gz) done @@ -67,7 +67,7 @@ for i in ${kbd/,/ }; do [ -e $src/kbd/$i ] || continue map=" $i" - [ ${kbd#*,} == $i ] && map= + [ ${kbd#*,} = $i ] && map= cat >> $fs/boot/isolinux/i18n.cfg <> $0 < /dev/null @@ -238,7 +238,7 @@ [ $always -eq 0 ] && exit 1 } -[ "$(readiso 17 7 23)" == "EL TORITO SPECIFICATION" ] || +[ "$(readiso 17 7 23)" = "EL TORITO SPECIFICATION" ] || abort "no boot record found." cat=$(read32 17 71) [ $(read32 $cat 0) -eq 1 -a $(read32 $cat 30) -eq $(( 0x88AA55 )) ] || diff -r 87d7af51ba68 -r 02c70d036ea0 tazwikiss/receipt --- a/tazwikiss/receipt Tue Feb 26 08:20:18 2019 +0100 +++ b/tazwikiss/receipt Tue Feb 26 09:14:07 2019 +0100 @@ -72,7 +72,7 @@ fi fi # Configure busybox/httpd server by default - if [ "$server" == "busybox" ]; then + if [ "$server" = "busybox" ]; then sed -i 's/lighttpd/httpd/' "$1/etc/rcS.conf" if [ ! -s "$1/etc/httpd.conf" ]; then cat > "$1/etc/httpd.conf" </dev/null 2>&1 & yad --button=gtk-stop --title='Stop xpenguins' $icon \ diff -r 87d7af51ba68 -r 02c70d036ea0 xsnow/stuff/xsnow.sh --- a/xsnow/stuff/xsnow.sh Tue Feb 26 08:20:18 2019 +0100 +++ b/xsnow/stuff/xsnow.sh Tue Feb 26 09:14:07 2019 +0100 @@ -36,18 +36,18 @@ winsd scrsd off trees santa rud winsn scrsn popupsn duration dummy<