diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-01-16 20:43:57 -0800 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-01-17 12:17:36 +0100 |
| commit | fb56573dc4a5dda48953916b533a26af68b16f11 (patch) | |
| tree | 51c836d90d489f7f640634a5b6736bb60d143870 | |
| parent | b8e17aefea91632a70634aa2828a8b548c2b2567 (diff) | |
| download | upstream-fb56573dc4a5dda48953916b533a26af68b16f11.tar.gz upstream-fb56573dc4a5dda48953916b533a26af68b16f11.tar.bz2 upstream-fb56573dc4a5dda48953916b533a26af68b16f11.zip | |
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>
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 40a7527aa5..8e189e4f4d 100755 --- 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 |