scripts: fix wrong usage of '==' operator

[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

View File

@@ -34,7 +34,7 @@ _ucidef_set_interface() {
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
json_select ..
}

View File

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

View File

@@ -9,15 +9,15 @@ do_led() {
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
}
}
[ "$1" == "clear" -o "$1" == "set" ] &&
[ "$1" = "clear" -o "$1" = "set" ] &&
[ -n "$2" ] &&{
config_load system
config_foreach do_led

View File

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

View File

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

View File

@@ -11,12 +11,12 @@ get_ifname() {
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
[ "interface" == "$TYPE" ] && {
[ "interface" = "$TYPE" ] && {
config_get device "$CONFIG_SECTION" ifname
[ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
config_set "$CONFIG_SECTION" device "$device"

View File

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

View File

@@ -186,7 +186,7 @@ network={
$wep_tx_keyidx
}
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
else
return 0

View File

@@ -29,7 +29,7 @@ append_bools() {
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"
done
}

View File

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

View File

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

View File

@@ -274,8 +274,8 @@ nand_do_upgrade_stage2() {
[ ! "$(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
nand_upgrade_tar $1
}

View File

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