[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
23 files changed:
json_select_object $name
json_add_string ifname "${iface%%.*}"
json_select_object $name
json_add_string ifname "${iface%%.*}"
- [ "$iface" == "${iface%%.*}" ] || json_add_boolean create_vlan 1
+ [ "$iface" = "${iface%%.*}" ] || json_add_boolean create_vlan 1
- [ "$UCIDEF_LEDS_CHANGED" == "1" ] && uci commit system
+ [ "$UCIDEF_LEDS_CHANGED" = "1" ] && uci commit system
}
ucidef_set_interface_loopback() {
}
ucidef_set_interface_loopback() {
local sysfs
config_get name $1 name
config_get sysfs $1 sysfs
local sysfs
config_get name $1 name
config_get sysfs $1 sysfs
- [ "$name" == "$NAME" -o "$sysfs" = "$NAME" -a -e "/sys/class/leds/${sysfs}" ] && {
- [ "$ACTION" == "set" ] &&
+ [ "$name" = "$NAME" -o "$sysfs" = "$NAME" -a -e "/sys/class/leds/${sysfs}" ] && {
+ [ "$ACTION" = "set" ] &&
echo 1 >/sys/class/leds/${sysfs}/brightness \
|| echo 0 >/sys/class/leds/${sysfs}/brightness
exit 0
}
}
echo 1 >/sys/class/leds/${sysfs}/brightness \
|| echo 0 >/sys/class/leds/${sysfs}/brightness
exit 0
}
}
-[ "$1" == "clear" -o "$1" == "set" ] &&
+[ "$1" = "clear" -o "$1" = "set" ] &&
[ -n "$2" ] &&{
config_load system
config_foreach do_led
[ -n "$2" ] &&{
config_load system
config_foreach do_led
_wifi_updown() {
for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled
_wifi_updown() {
for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled
- [ 1 == "$disabled" ] && {
+ [ "$disabled" = "1" ] && {
echo "'$device' is disabled"
set disable
}
echo "'$device' is disabled"
set disable
}
json_get_vars bssid ssid key mcast_rate
keyspec=
json_get_vars bssid ssid key mcast_rate
keyspec=
- [ "$auth_type" == "wep" ] && {
+ [ "$auth_type" = "wep" ] && {
set_default key 1
case "$key" in
[1234])
set_default key 1
case "$key" in
[1234])
scan_interfaces
config_get cfgt "$interface" TYPE
scan_interfaces
config_get cfgt "$interface" TYPE
- [ "$cfgt" == "interface" ] && config_get "$interface" ifname
+ [ "$cfgt" = "interface" ] && config_get "$interface" ifname
}
config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE
}
config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE
- [ "interface" == "$TYPE" ] && {
+ [ "interface" = "$TYPE" ] && {
config_get device "$CONFIG_SECTION" ifname
[ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
config_set "$CONFIG_SECTION" device "$device"
config_get device "$CONFIG_SECTION" ifname
[ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
config_set "$CONFIG_SECTION" device "$device"
skip=0
for server in ${ignore}
do
skip=0
for server in ${ignore}
do
- if [ "${pid}" == "${server}" ]
+ if [ "${pid}" = "${server}" ]
- 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
else
return 0
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
return 0
local p; local v; local s="$1"; shift
for p in $*; do
config_get_bool v "$s" "$p"
local p; local v; local s="$1"; shift
for p in $*; do
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"
local ifaces=""
config_get proto "$cfg" proto
local ifaces=""
config_get proto "$cfg" proto
- [[ "$proto" == relay ]] || return 0
+ [ "$proto" = "relay" ] || return 0
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
do_snapshot_upgrade() {
opkg update
do_snapshot_upgrade() {
opkg update
UPDATES=`opkg list-upgradable | cut -d" " -f1`
[ -z "${UPDATES}" ] && exit 0
opkg upgrade ${UPDATES}
UPDATES=`opkg list-upgradable | cut -d" " -f1`
[ -z "${UPDATES}" ] && exit 0
opkg upgrade ${UPDATES}
[ ! "$(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" == "ubifs" ] && nand_upgrade_ubifs $1
+ [ "$file_type" = "ubi" ] && nand_upgrade_ubinized $1
+ [ "$file_type" = "ubifs" ] && nand_upgrade_ubifs $1
while [ -n "$1" ]; do
local var="${1%%=*}"
local val="${1#*=}"
while [ -n "$1" ]; do
local var="${1%%=*}"
local val="${1#*=}"
- [[ "$1" == "$val" ]] && val=
+ [ "$1" = "$val" ] && val=
json_add_string "$var" "$val"
shift
done
json_add_string "$var" "$val"
shift
done
-if [ "$2" == "asus" ]; then
+if [ "$2" = "asus" ]; then
echo Confirming IP address setting...
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 -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
echo Please wait until leds stops flashing.
echo Confirming IP address setting...
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 -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
echo Please wait until leds stops flashing.
-elif [ "$2" == "linksys" ]; then
+elif [ "$2" = "linksys" ]; then
echo Flashing 192.168.1.1 using $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 Flashing 192.168.1.1 using $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.
-elif [ "$2" == "toshiba" ]; then
+elif [ "$2" = "toshiba" ]; then
echo Flashing 192.168.10.1 using $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 Flashing 192.168.10.1 using $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.
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 name $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"
uci commit network
}
logger -t migrate-switchX "Switch names updated, saving network configuration"
uci commit network
}
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}"
LED_OPTIONS_CHANGED=1
uci set system.${cfg}.sysfs="${new_sysfs}"
LED_OPTIONS_CHANGED=1
-[ "$LED_OPTIONS_CHANGED" == "1" ] && uci commit system
+[ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system
#!/usr/bin/env bash
set -x
#!/usr/bin/env bash
set -x
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
exit 1
}
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size>"
exit 1
}
ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
local try=0;
ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
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
for npe in eth0 eth1 eth2
do
for npe in eth0 eth1 eth2
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)
fi
done
ifconfig $npe hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n npe_"$npe"_esa)
fi
done
# Some developers should be shot on sight at Zcom/Netgear
# -- Fixup for the WG302v1, need someone with a WAG302v1 to fix that, too
# Some developers should be shot on sight at Zcom/Netgear
# -- 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)
fi
# Others (*cough*, Tonze) are dumb enough to not handle mac addresses at all
ifconfig eth0 hw ether $(fconfig -s -r -d /dev/$RB_CONFIG -n zcom_npe_esa)
fi
# 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
fi
ifconfig eth0 hw ether 00:11:22:33:44:55
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
fi
}
ifconfig eth1 hw ether 00:11:22:33:44:56
fi
}
-[ "$ACTION" == "motion" ] && logger webcam motion event
+[ "$ACTION" = "motion" ] && logger webcam motion event
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 signature=$(dd if=$rootfs_mtd skip=$offset bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')
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 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
fi
;;
dd conv=notrunc if=$rootfs_mtd skip=$offset of=$firmware_mtd bs=1 count=64 2>/dev/null
fi
;;
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
exit 1
}
echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
exit 1
}
#!/usr/bin/env bash
# Copyright (C) 2006-2012 OpenWrt.org
set -x
#!/usr/bin/env bash
# Copyright (C) 2006-2012 OpenWrt.org
set -x
-[ $# == 5 -o $# == 6 ] || {
+[ $# -eq 5 -o $# -eq 6 ] || {
echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
exit 1
}
echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
exit 1
}
projects / openwrt / openwrt.git / commitdiff