mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
base-files/functions.sh: use && instead of -a
-a is not well defined. https://github.com/koalaman/shellcheck/wiki/SC2166 Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
b8e17aefea
commit
fb56573dc4
@ -143,7 +143,7 @@ config_foreach() {
|
|||||||
[ -z "$CONFIG_SECTIONS" ] && return 0
|
[ -z "$CONFIG_SECTIONS" ] && return 0
|
||||||
for section in ${CONFIG_SECTIONS}; do
|
for section in ${CONFIG_SECTIONS}; do
|
||||||
config_get cfgtype "$section" TYPE
|
config_get cfgtype "$section" TYPE
|
||||||
[ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
|
[ -n "$___type" ] && [ "x$cfgtype" != "x$___type" ] && continue
|
||||||
eval "$___function \"\$section\" \"\$@\""
|
eval "$___function \"\$section\" \"\$@\""
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -374,4 +374,4 @@ board_name() {
|
|||||||
[ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic"
|
[ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic"
|
||||||
}
|
}
|
||||||
|
|
||||||
[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
|
[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user