diff options
| author | John Crispin <blogic@openwrt.org> | 2014-10-14 12:21:11 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-10-14 12:21:11 +0000 |
| commit | 81d9f2d5856395476060d7107e0bfba1696228d1 (patch) | |
| tree | d3a0f88b38cdfc9e7a6cb1246fd98d8b0249990a /package/base-files | |
| parent | 82fa1674e0f97e634c0be3a345cfc7575c36f659 (diff) | |
| download | upstream-81d9f2d5856395476060d7107e0bfba1696228d1.tar.gz upstream-81d9f2d5856395476060d7107e0bfba1696228d1.tar.bz2 upstream-81d9f2d5856395476060d7107e0bfba1696228d1.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/files/lib/functions/uci-defaults-new.sh | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/functions/uci-defaults.sh | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/led.sh | 6 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/wifi | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/files/lib/functions/uci-defaults-new.sh b/package/base-files/files/lib/functions/uci-defaults-new.sh index ba954dee21..0751744dcb 100755 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ b/package/base-files/files/lib/functions/uci-defaults-new.sh @@ -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 .. } diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 798d6baa79..6ed0bf1176 100644 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -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() { diff --git a/package/base-files/files/sbin/led.sh b/package/base-files/files/sbin/led.sh index d67a0f51cc..d750f06ea7 100755 --- a/package/base-files/files/sbin/led.sh +++ b/package/base-files/files/sbin/led.sh @@ -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 diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index 051bc89a2d..2476414337 100755 --- a/package/base-files/files/sbin/wifi +++ b/package/base-files/files/sbin/wifi @@ -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 } |