From 228a86e5c07a8a683cabb0308602c4a0709171f2 Mon Sep 17 00:00:00 2001 From: Marco Ferrari Date: Mon, 31 Aug 2020 19:56:49 +0200 Subject: [PATCH] Remove duplicate output lines when checking for ZSH scripts --- lib/buildFileList.sh | 8 +++----- lib/worker.sh | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index 431b3d26..bbb31e8c 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -100,8 +100,7 @@ function BuildFileList() { [ "${FILE_TYPE}" == "dash" ] || [ "${FILE_TYPE}" == "ksh" ]; then # Need to check if its a zsh file as we cannot parse it if CheckZsh "${FILE}"; then - warn "Found [zsh] script: ${FILE}" - info "ShellCheck does NOT currently support zsh, skipping file" + warn "ShellCheck and shfmt do NOT currently support zsh, skipping file" else ################################ # Append the file to the array # @@ -679,7 +678,7 @@ function CheckFileType() { ###################### # It is a ZSH script # ###################### - warn "Found [zsh] script" + warn "Found [zsh] script: ${FILE}" info "ShellCheck does NOT currently support zsh, skipping file" else ############################ @@ -712,8 +711,7 @@ function CheckZsh() { ###################### # It is a ZSH script # ###################### - warn "Found [zsh] script" - info "ShellCheck does NOT currently support zsh, skipping file" + debug "Found [zsh] script: ${FILE}" ################################################### # We found zsh file and need to return with a hit # ################################################### diff --git a/lib/worker.sh b/lib/worker.sh index 48a06745..25614675 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -165,13 +165,11 @@ function LintCodebase() { continue elif [[ ${FILE_TYPE} == "BASH" ]] && CheckZsh "${FILE}"; then # ZSH file and we need to skip - warn "Found [zsh] script: ${FILE}" - info "ShellCheck does NOT currently support zsh, skipping file" + warn "$LINTER_NAME does NOT currently support zsh, skipping file" continue elif [[ ${FILE_TYPE} == "SHELL_SHFMT" ]] && CheckZsh "${FILE}"; then # ZSH file and we need to skip - warn "Found [zsh] script: ${FILE}" - info "shfmt does NOT currently support zsh, skipping file" + warn "$LINTER_NAME does NOT currently support zsh, skipping file" continue fi