IMP(shellcheck): replace -a in condition by && (SC2166)

This commit is contained in:
Thibault Ayanides
2020-12-04 15:29:19 +01:00
parent d371b8d057
commit 72bb3e2b84
10 changed files with 14 additions and 14 deletions

View File

@ -28,7 +28,7 @@ while [[ $# > 0 ]]; do
forcedstatus=auditall
;;
--audit)
if [ "$status" != 'disabled' -a "$status" != 'false' ]; then
if [ "$status" != 'disabled' ] && [ "$status" != 'false' ]; then
debug "Audit argument detected, setting status to audit"
forcedstatus=audit
else
@ -85,7 +85,7 @@ if [ "$forcedstatus" = "auditall" ]; then
status=audit
elif [ "$forcedstatus" = "audit" ]; then
# We want to audit only enabled scripts
if [ "$status" != 'disabled' -a "$status" != 'false' ]; then
if [ "$status" != 'disabled' ] && [ "$status" != 'false' ]; then
debug "Audit argument detected, setting status to audit"
status=audit
else

View File

@ -270,7 +270,7 @@ is_kernel_option_enabled() {
FNRET=2 # Not found
fi
if $SUDO_CMD [ "$FNRET" -ne 0 -a -n "$MODULE_NAME" -a -d "/lib/modules/$(uname -r)" ]; then
if $SUDO_CMD [ "$FNRET" -ne 0 ] && [ -n "$MODULE_NAME" ] && [ -d "/lib/modules/$(uname -r)" ]; then
# also check in modules, because even if not =y, maybe
# the admin compiled it separately later (or out-of-tree)
# as a module (regardless of the fact that we have =m or not)