aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-10-14 12:21:11 +0000
committerJohn Crispin <john@openwrt.org>2014-10-14 12:21:11 +0000
commit20940138ac41e3eca54afefc34f65e40834be3ea (patch)
tree3c34846e48daad4595ab2ab2c00f1068022ee62f /package
parent8267c0e2ac371fe0f93ba34f745976acf358a253 (diff)
downloadupstream-20940138ac41e3eca54afefc34f65e40834be3ea.tar.gz
upstream-20940138ac41e3eca54afefc34f65e40834be3ea.tar.bz2
upstream-20940138ac41e3eca54afefc34f65e40834be3ea.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> SVN-Revision: 42911
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults-new.sh2
-rw-r--r--package/base-files/files/lib/functions/uci-defaults.sh2
-rwxr-xr-xpackage/base-files/files/sbin/led.sh6
-rwxr-xr-xpackage/base-files/files/sbin/wifi2
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh2
-rwxr-xr-xpackage/network/config/qos-scripts/files/usr/bin/qos-stat4
-rwxr-xr-xpackage/network/services/dropbear/files/dropbear.init2
-rw-r--r--package/network/services/hostapd/files/wpa_supplicant.sh2
-rw-r--r--package/network/services/openvpn/files/openvpn.init2
-rw-r--r--package/network/services/relayd/files/relay.init2
-rw-r--r--package/system/fstools/files/snapshot6
-rw-r--r--package/system/procd/files/nand.sh4
-rw-r--r--package/system/procd/files/procd.sh2
13 files changed, 19 insertions, 19 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
}
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index e6241deb5f..918955a98a 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -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])
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
diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
index 1450e12458..a0e0ec0c33 100644
--- a/package/system/fstools/files/snapshot
+++ b/package/system/fstools/files/snapshot
@@ -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
diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index fd2f943ba3..f933629e8e 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -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
}
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 109daee64c..be1d888a19 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -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