mirror of
https://github.com/ovh/debian-cis.git
synced 2025-06-22 02:33:42 +02:00
chore: make linter happy for existing code
This commit is contained in:
@ -26,6 +26,8 @@ FILE='/etc/udev/rules.d/10-CIS_99.2_usb_devices.sh'
|
|||||||
# This function will be called if the script status is on enabled / audit mode
|
# This function will be called if the script status is on enabled / audit mode
|
||||||
audit() {
|
audit() {
|
||||||
SEARCH_RES=0
|
SEARCH_RES=0
|
||||||
|
# if SC2086 is fixed (double quotes) instead of skipped, then shellcheck will complain that double quotes will prevent the loop (SC2066)
|
||||||
|
# shellcheck disable=SC2086
|
||||||
for FILE_SEARCHED in $FILES_TO_SEARCH; do
|
for FILE_SEARCHED in $FILES_TO_SEARCH; do
|
||||||
if [ "$SEARCH_RES" = 1 ]; then break; fi
|
if [ "$SEARCH_RES" = 1 ]; then break; fi
|
||||||
if $SUDO_CMD test -d "$FILE_SEARCHED"; then
|
if $SUDO_CMD test -d "$FILE_SEARCHED"; then
|
||||||
|
@ -148,5 +148,5 @@ div() {
|
|||||||
fi
|
fi
|
||||||
local _r=$(($1$_n / $2))
|
local _r=$(($1$_n / $2))
|
||||||
_r=${_r:0:-$_d}.${_r: -$_d}
|
_r=${_r:0:-$_d}.${_r: -$_d}
|
||||||
echo $_r
|
echo "$_r"
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ has_sysctl_param_expected_result() {
|
|||||||
local SYSCTL_PARAM=$1
|
local SYSCTL_PARAM=$1
|
||||||
local EXP_RESULT=$2
|
local EXP_RESULT=$2
|
||||||
|
|
||||||
|
# shellcheck disable=SC2319
|
||||||
if [ "$($SUDO_CMD sysctl "$SYSCTL_PARAM" 2>/dev/null)" = "$SYSCTL_PARAM = $EXP_RESULT" ]; then
|
if [ "$($SUDO_CMD sysctl "$SYSCTL_PARAM" 2>/dev/null)" = "$SYSCTL_PARAM = $EXP_RESULT" ]; then
|
||||||
FNRET=0
|
FNRET=0
|
||||||
elif [ "$?" = 255 ]; then
|
elif [ "$?" = 255 ]; then
|
||||||
@ -35,6 +36,7 @@ set_sysctl_param() {
|
|||||||
local SYSCTL_PARAM=$1
|
local SYSCTL_PARAM=$1
|
||||||
local VALUE=$2
|
local VALUE=$2
|
||||||
debug "Setting $SYSCTL_PARAM to $VALUE"
|
debug "Setting $SYSCTL_PARAM to $VALUE"
|
||||||
|
# shellcheck disable=SC2319
|
||||||
if [ "$(sysctl -w "$SYSCTL_PARAM"="$VALUE" 2>/dev/null)" = "$SYSCTL_PARAM = $VALUE" ]; then
|
if [ "$(sysctl -w "$SYSCTL_PARAM"="$VALUE" 2>/dev/null)" = "$SYSCTL_PARAM = $VALUE" ]; then
|
||||||
FNRET=0
|
FNRET=0
|
||||||
elif [ $? = 255 ]; then
|
elif [ $? = 255 ]; then
|
||||||
|
@ -14,7 +14,8 @@ fi
|
|||||||
for f in $files; do
|
for f in $files; do
|
||||||
if head "$f" | grep -qE "^# run-shellcheck$"; then
|
if head "$f" | grep -qE "^# run-shellcheck$"; then
|
||||||
printf "\e[1;36mRunning shellcheck on: %s \e[0m\n" "$f"
|
printf "\e[1;36mRunning shellcheck on: %s \e[0m\n" "$f"
|
||||||
if ! /usr/bin/shellcheck --color=always --shell=bash -x --source-path=SCRIPTDIR "$f"; then
|
# SC2317: command unreachable, sometimes has a hard time reaching the command in a function
|
||||||
|
if ! /usr/bin/shellcheck --exclude=SC2317 --color=always --shell=bash -x --source-path=SCRIPTDIR "$f"; then
|
||||||
retval=$((retval + 1))
|
retval=$((retval + 1))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -13,7 +13,7 @@ cleanup_and_exit() {
|
|||||||
if [ "$totalerrors" -eq 255 ]; then
|
if [ "$totalerrors" -eq 255 ]; then
|
||||||
fatal "RUNTIME ERROR"
|
fatal "RUNTIME ERROR"
|
||||||
fi
|
fi
|
||||||
exit $totalerrors
|
exit "$totalerrors"
|
||||||
}
|
}
|
||||||
trap "cleanup_and_exit" EXIT HUP INT
|
trap "cleanup_and_exit" EXIT HUP INT
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ play_consistency_tests() {
|
|||||||
ok "$name logs are identical"
|
ok "$name logs are identical"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ 1 -eq $consist_test ]; then
|
if [ 1 -eq "$consist_test" ]; then
|
||||||
nbfailedconsist=$((nbfailedconsist + 1))
|
nbfailedconsist=$((nbfailedconsist + 1))
|
||||||
listfailedconsist="$listfailedconsist $(make_usecase_name "$usecase" consist)"
|
listfailedconsist="$listfailedconsist $(make_usecase_name "$usecase" consist)"
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user