From 20940138ac41e3eca54afefc34f65e40834be3ea Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 14 Oct 2014 12:21:11 +0000 Subject: 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 SVN-Revision: 42911 --- package/network/config/qos-scripts/files/usr/bin/qos-stat | 4 ++-- package/network/services/dropbear/files/dropbear.init | 2 +- package/network/services/hostapd/files/wpa_supplicant.sh | 2 +- package/network/services/openvpn/files/openvpn.init | 2 +- package/network/services/relayd/files/relay.init | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'package/network') diff --git a/package/network/config/qos-scripts/files/usr/bin/qos-stat b/package/network/config/qos-scripts/files/usr/bin/qos-stat index 78d163888b..cbbf8e8de8 100755 --- a/package/network/config/qos-scripts/files/usr/bin/qos-stat +++ b/package/network/config/qos-scripts/files/usr/bin/qos-stat @@ -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" diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 860235e9b7..6de0142728 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -165,7 +165,7 @@ killclients() skip=0 for server in ${ignore} do - if [ "${pid}" == "${server}" ] + if [ "${pid}" = "${server}" ] then skip=1 break diff --git a/package/network/services/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh index bd8680157a..b6784843e8 100644 --- a/package/network/services/hostapd/files/wpa_supplicant.sh +++ b/package/network/services/hostapd/files/wpa_supplicant.sh @@ -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 diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init index f3068f0bd3..9822f1e058 100644 --- a/package/network/services/openvpn/files/openvpn.init +++ b/package/network/services/openvpn/files/openvpn.init @@ -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 } diff --git a/package/network/services/relayd/files/relay.init b/package/network/services/relayd/files/relay.init index e38143f6e7..3635e9c4bd 100644 --- a/package/network/services/relayd/files/relay.init +++ b/package/network/services/relayd/files/relay.init @@ -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 -- cgit v1.2.3