domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: fix wrong usage of '==' operator

Browse Source 
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 42911
This commit is contained in:
John Crispin
2014-10-14 12:21:11 +00:00
parent 8267c0e2ac
commit 20940138ac
23 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/functions/uci-defaults-new.sh
View File

@@ -34,7 +34,7 @@ _ucidef_set_interface() {
json_select_object $name json_select_object $name
json_add_string ifname "${iface%%.*}" json_add_string ifname "${iface%%.*}"
[ "$iface" == "${iface%%.*}" ] || json_add_boolean create_vlan 1 [ "$iface" = "${iface%%.*}" ] || json_add_boolean create_vlan 1
json_select .. json_select ..
} }

2
package/base-files/files/lib/functions/uci-defaults.sh
View File

@@ -140,7 +140,7 @@ EOF
ucidef_commit_leds() ucidef_commit_leds()
{ {
[ "$UCIDEF_LEDS_CHANGED" == "1" ] && uci commit system [ "$UCIDEF_LEDS_CHANGED" = "1" ] && uci commit system
} }
ucidef_set_interface_loopback() { ucidef_set_interface_loopback() {

6
package/base-files/files/sbin/led.sh
View File

@@ -9,15 +9,15 @@ do_led() {
local sysfs local sysfs
config_get name $1 name config_get name $1 name
config_get sysfs $1 sysfs config_get sysfs $1 sysfs
[ "$name" == "$NAME" -o "$sysfs" = "$NAME" -a -e "/sys/class/leds/${sysfs}" ] && { [ "$name" = "$NAME" -o "$sysfs" = "$NAME" -a -e "/sys/class/leds/${sysfs}" ] && {
[ "$ACTION" == "set" ] && [ "$ACTION" = "set" ] &&
echo 1 >/sys/class/leds/${sysfs}/brightness \ echo 1 >/sys/class/leds/${sysfs}/brightness \
|| echo 0 >/sys/class/leds/${sysfs}/brightness || echo 0 >/sys/class/leds/${sysfs}/brightness
exit 0 exit 0
} }
} }
[ "$1" == "clear" -o "$1" == "set" ] && [ "$1" = "clear" -o "$1" = "set" ] &&
[ -n "$2" ] &&{ [ -n "$2" ] &&{
config_load system config_load system
config_foreach do_led config_foreach do_led

2
package/base-files/files/sbin/wifi
View File

@@ -108,7 +108,7 @@ wifi_fixup_hwmode() {
_wifi_updown() { _wifi_updown() {
for device in ${2:-$DEVICES}; do ( for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled config_get disabled "$device" disabled
[ 1 == "$disabled" ] && { [ "$disabled" = "1" ] && {
echo "'$device' is disabled" echo "'$device' is disabled"
set disable set disable
} }

2
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -476,7 +476,7 @@ mac80211_setup_adhoc() {
json_get_vars bssid ssid key mcast_rate json_get_vars bssid ssid key mcast_rate
keyspec= keyspec=
[ "$auth_type" == "wep" ] && { [ "$auth_type" = "wep" ] && {
set_default key 1 set_default key 1
case "$key" in case "$key" in
[1234]) [1234])

4
package/network/config/qos-scripts/files/usr/bin/qos-stat
View File

@@ -11,12 +11,12 @@ get_ifname() {
scan_interfaces scan_interfaces
config_get cfgt "$interface" TYPE config_get cfgt "$interface" TYPE
[ "$cfgt" == "interface" ] && config_get "$interface" ifname [ "$cfgt" = "interface" ] && config_get "$interface" ifname
} }
config_cb() { config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE config_get TYPE "$CONFIG_SECTION" TYPE
[ "interface" == "$TYPE" ] && { [ "interface" = "$TYPE" ] && {
config_get device "$CONFIG_SECTION" ifname config_get device "$CONFIG_SECTION" ifname
[ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})" [ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
config_set "$CONFIG_SECTION" device "$device" config_set "$CONFIG_SECTION" device "$device"

2
package/network/services/dropbear/files/dropbear.init
View File

@@ -165,7 +165,7 @@ killclients()
skip=0 skip=0
for server in ${ignore} for server in ${ignore}
do do
if [ "${pid}" == "${server}" ] if [ "${pid}" = "${server}" ]
then then
skip=1 skip=1
break break

2
package/network/services/hostapd/files/wpa_supplicant.sh
View File

@@ -186,7 +186,7 @@ network={
$wep_tx_keyidx $wep_tx_keyidx
} }
EOF EOF
if [ -n "$proto" -o "$key_mgmt" == "NONE" ]; then if [ -n "$proto" -o "$key_mgmt" = "NONE" ]; then
wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
else else
return 0 return 0

2
package/network/services/openvpn/files/openvpn.init
View File

@@ -29,7 +29,7 @@ append_bools() {
local p; local v; local s="$1"; shift local p; local v; local s="$1"; shift
for p in $*; do for p in $*; do
config_get_bool v "$s" "$p" config_get_bool v "$s" "$p"
[ "$v" == 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf" [ "$v" = 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
done done
} }

2
package/network/services/relayd/files/relay.init
View File

@@ -39,7 +39,7 @@ start_relay() {
local ifaces="" local ifaces=""
config_get proto "$cfg" proto config_get proto "$cfg" proto
[[ "$proto" == relay ]] || return 0 [ "$proto" = "relay" ] || return 0
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1 SERVICE_WRITE_PID=1

6
package/system/fstools/files/snapshot
View File

@@ -38,16 +38,16 @@ do_config_push() {
do_snapshot_upgrade() { do_snapshot_upgrade() {
opkg update opkg update
[ $? == 0 ] || exit 1 [ $? -eq 0 ] || exit 1
opkg list-upgradable opkg list-upgradable
[ $? == 0 ] || exit 2 [ $? -eq 0 ] || exit 2
UPDATES=`opkg list-upgradable | cut -d" " -f1` UPDATES=`opkg list-upgradable | cut -d" " -f1`
[ -z "${UPDATES}" ] && exit 0 [ -z "${UPDATES}" ] && exit 0
opkg upgrade ${UPDATES} opkg upgrade ${UPDATES}
[ $? == 0 ] || exit 3 [ $? -eq 0 ] || exit 3
do_snapshot_push do_snapshot_push
sleep 5 sleep 5

4
package/system/procd/files/nand.sh
View File

@@ -274,8 +274,8 @@ nand_do_upgrade_stage2() {
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs" [ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
[ "$file_type" == "ubi" ] && nand_upgrade_ubinized $1 [ "$file_type" = "ubi" ] && nand_upgrade_ubinized $1
[ "$file_type" == "ubifs" ] && nand_upgrade_ubifs $1 [ "$file_type" = "ubifs" ] && nand_upgrade_ubifs $1
nand_upgrade_tar $1 nand_upgrade_tar $1
} }

2
package/system/procd/files/procd.sh
View File

@@ -93,7 +93,7 @@ _procd_add_table_data() {
while [ -n "$1" ]; do while [ -n "$1" ]; do
local var="${1%%=*}" local var="${1%%=*}"
local val="${1#*=}" local val="${1#*=}"
[[ "$1" == "$val" ]] && val= [ "$1" = "$val" ] && val=
json_add_string "$var" "$val" json_add_string "$var" "$val"
shift shift
done done

6
scripts/flashing/flash.sh
View File

@@ -49,17 +49,17 @@ Notes for Toshiba router:
EOF EOF
exit 0 exit 0
fi fi
if [ "$2" == "asus" ]; then if [ "$2" = "asus" ]; then
echo Confirming IP address setting... echo Confirming IP address setting...
echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1 echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1
echo Flashing 192.168.1.1 using $1... echo Flashing 192.168.1.1 using $1...
echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1 echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
echo Please wait until leds stops flashing. echo Please wait until leds stops flashing.
elif [ "$2" == "linksys" ]; then elif [ "$2" = "linksys" ]; then
echo Flashing 192.168.1.1 using $1... echo Flashing 192.168.1.1 using $1...
echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1 echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1
echo Please wait until power led stops flashing. Do not poweroff! Then you can login via telnet 192.168.1.1. echo Please wait until power led stops flashing. Do not poweroff! Then you can login via telnet 192.168.1.1.
elif [ "$2" == "toshiba" ]; then elif [ "$2" = "toshiba" ]; then
echo Flashing 192.168.10.1 using $1... echo Flashing 192.168.10.1 using $1...
echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.10.1 echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.10.1
echo Unit will automatically reboot within 5 minutes. Do not power off. Then you can login via telnet 192.168.10.1. echo Unit will automatically reboot within 5 minutes. Do not power off. Then you can login via telnet 192.168.10.1.

2
target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
View File

@@ -34,7 +34,7 @@ migrate_switch_name() {
config_foreach do_change_switch_name switch name $oldname $newname config_foreach do_change_switch_name switch name $oldname $newname
config_foreach do_change_switch_name switch_vlan device $oldname $newname config_foreach do_change_switch_name switch_vlan device $oldname $newname
[ "$SWITCH_NAME_CHANGED" == "1" ] && { [ "$SWITCH_NAME_CHANGED" = "1" ] && {
logger -t migrate-switchX "Switch names updated, saving network configuration" logger -t migrate-switchX "Switch names updated, saving network configuration"
uci commit network uci commit network
} }

4
target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
View File

@@ -26,7 +26,7 @@ do_led_update_sysfs()
new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/") new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/")
[ "${new_sysfs}" == "${sysfs}" ] && continue [ "$new_sysfs" = "$sysfs" ] && continue
uci set system.${cfg}.sysfs="${new_sysfs}" uci set system.${cfg}.sysfs="${new_sysfs}"
LED_OPTIONS_CHANGED=1 LED_OPTIONS_CHANGED=1
@@ -80,6 +80,6 @@ wnr612-v2)
;; ;;
esac esac
[ "$LED_OPTIONS_CHANGED" == "1" ] && uci commit system [ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system
exit 0 exit 0

2
target/linux/brcm2708/image/gen_rpi_sdcard_img.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -x set -x
[ $# == 5 ] || { [ $# -eq 5 ] || {
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>" echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
exit 1 exit 1
} }

2
target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm
View File

@@ -11,6 +11,6 @@ preinit_ip() {
ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
local try=0; local try=0;
while [ $((try++)) -le 5 ] && [ ! $(cat /sys/class/net/$pi_ifname/operstate) == "up" ]; do sleep 1; done while [ $((try++)) -le 5 ] && [ ! "$(cat /sys/class/net/$pi_ifname/operstate)" = "up" ]; do sleep 1; done
} }
} }

8
target/linux/ixp4xx/base-files/lib/preinit/05_set_ether_mac_ixp4xx
View File

@@ -6,7 +6,7 @@ set_ether_mac() {
for npe in eth0 eth1 eth2 for npe in eth0 eth1 eth2
do do
if [ "$(ifconfig $npe 2>/dev/null | grep -c 00:00:00:00:00:00)" == "1" ]; then if [ "$(ifconfig $npe 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
ifconfig $npe hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n npe_"$npe"_esa) ifconfig $npe hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n npe_"$npe"_esa)
fi fi
done done
@@ -14,16 +14,16 @@ set_ether_mac() {
# Some developers should be shot on sight at Zcom/Netgear # Some developers should be shot on sight at Zcom/Netgear
# -- Fixup for the WG302v1, need someone with a WAG302v1 to fix that, too # -- Fixup for the WG302v1, need someone with a WAG302v1 to fix that, too
if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" == "1" ]; then if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
ifconfig eth0 hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n zcom_npe_esa) ifconfig eth0 hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n zcom_npe_esa)
fi fi
# Others (*cough*, Tonze) are dumb enough to not handle mac addresses at all # Others (*cough*, Tonze) are dumb enough to not handle mac addresses at all
if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" == "1" ]; then if [ "$(ifconfig eth0 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
ifconfig eth0 hw ether 00:11:22:33:44:55 ifconfig eth0 hw ether 00:11:22:33:44:55
fi fi
if [ "$(ifconfig eth1 2>/dev/null | grep -c 00:00:00:00:00:00)" == "1" ]; then if [ "$(ifconfig eth1 2>/dev/null | grep -c 00:00:00:00:00:00)" = "1" ]; then
ifconfig eth1 hw ether 00:11:22:33:44:56 ifconfig eth1 hw ether 00:11:22:33:44:56
fi fi
} }

2
target/linux/ramips/base-files/etc/hotplug.d/usb/10-motion
View File

@@ -1 +1 @@
[ "$ACTION" == "motion" ] && logger webcam motion event [ "$ACTION" = "motion" ] && logger webcam motion event

2
target/linux/ramips/base-files/lib/preinit/04_handle_checksumming
View File

@@ -44,7 +44,7 @@ do_checksumming_disable() {
local rootfs_data_len=$(grep \"rootfs_data\" /proc/mtd | awk -F' ' '{print "0x"$2}') local rootfs_data_len=$(grep \"rootfs_data\" /proc/mtd | awk -F' ' '{print "0x"$2}')
local offset=$(echo "$rootfs_len $rootfs_data_len 0x40" | awk -F' ' '{printf "%i",$1-$2-$3}') local offset=$(echo "$rootfs_len $rootfs_data_len 0x40" | awk -F' ' '{printf "%i",$1-$2-$3}')
local signature=$(dd if=$rootfs_mtd skip=$offset bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"') local signature=$(dd if=$rootfs_mtd skip=$offset bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')
if [ "$signature" == "27051956" ]; then if [ "$signature" = "27051956" ]; then
dd conv=notrunc if=$rootfs_mtd skip=$offset of=$firmware_mtd bs=1 count=64 2>/dev/null dd conv=notrunc if=$rootfs_mtd skip=$offset of=$firmware_mtd bs=1 count=64 2>/dev/null
fi fi
;; ;;

2
target/linux/sunxi/image/gen_sunxi_sdcard_img.sh
View File

@@ -8,7 +8,7 @@
# #
set -x set -x
[ $# == 6 ] || { [ $# -eq 6 ] || {
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>" echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
exit 1 exit 1
} }

2
target/linux/x86_64/image/gen_image_generic.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (C) 2006-2012 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
set -x set -x
[ $# == 5 -o $# == 6 ] || { [ $# -eq 5 -o $# -eq 6 ] || {
echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]" echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
exit 1 exit 1
} }