Remove duplicate output lines when checking for ZSH scripts

This commit is contained in:
Marco Ferrari 2020-08-31 19:56:49 +02:00
parent 798311822a
commit 228a86e5c0
2 changed files with 5 additions and 9 deletions

View file

@ -100,8 +100,7 @@ function BuildFileList() {
[ "${FILE_TYPE}" == "dash" ] || [ "${FILE_TYPE}" == "ksh" ]; then [ "${FILE_TYPE}" == "dash" ] || [ "${FILE_TYPE}" == "ksh" ]; then
# Need to check if its a zsh file as we cannot parse it # Need to check if its a zsh file as we cannot parse it
if CheckZsh "${FILE}"; then if CheckZsh "${FILE}"; then
warn "Found [zsh] script: ${FILE}" warn "ShellCheck and shfmt do NOT currently support zsh, skipping file"
info "ShellCheck does NOT currently support zsh, skipping file"
else else
################################ ################################
# Append the file to the array # # Append the file to the array #
@ -679,7 +678,7 @@ function CheckFileType() {
###################### ######################
# It is a ZSH script # # It is a ZSH script #
###################### ######################
warn "Found [zsh] script" warn "Found [zsh] script: ${FILE}"
info "ShellCheck does NOT currently support zsh, skipping file" info "ShellCheck does NOT currently support zsh, skipping file"
else else
############################ ############################
@ -712,8 +711,7 @@ function CheckZsh() {
###################### ######################
# It is a ZSH script # # It is a ZSH script #
###################### ######################
warn "Found [zsh] script" debug "Found [zsh] script: ${FILE}"
info "ShellCheck does NOT currently support zsh, skipping file"
################################################### ###################################################
# We found zsh file and need to return with a hit # # We found zsh file and need to return with a hit #
################################################### ###################################################

View file

@ -165,13 +165,11 @@ function LintCodebase() {
continue continue
elif [[ ${FILE_TYPE} == "BASH" ]] && CheckZsh "${FILE}"; then elif [[ ${FILE_TYPE} == "BASH" ]] && CheckZsh "${FILE}"; then
# ZSH file and we need to skip # ZSH file and we need to skip
warn "Found [zsh] script: ${FILE}" warn "$LINTER_NAME does NOT currently support zsh, skipping file"
info "ShellCheck does NOT currently support zsh, skipping file"
continue continue
elif [[ ${FILE_TYPE} == "SHELL_SHFMT" ]] && CheckZsh "${FILE}"; then elif [[ ${FILE_TYPE} == "SHELL_SHFMT" ]] && CheckZsh "${FILE}"; then
# ZSH file and we need to skip # ZSH file and we need to skip
warn "Found [zsh] script: ${FILE}" warn "$LINTER_NAME does NOT currently support zsh, skipping file"
info "shfmt does NOT currently support zsh, skipping file"
continue continue
fi fi