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>

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index 40a7527aa52e7246dbeaa2f15ac40e6ed6fd1938..8e189e4f4df32a39db0dc2e47c4ec3830af402d9 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -143,7 +143,7 @@ config_foreach() {
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
-               [ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
+               [ -n "$___type" ] && [ "x$cfgtype" != "x$___type" ] && continue
                eval "$___function \"\$section\" \"\$@\""
        done
 }
@@ -374,4 +374,4 @@ board_name() {
        [ -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