From 3bc0b6debbb156eee242c68871b398de2cd6fd12 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 6 Jul 2020 15:01:13 -0500 Subject: [PATCH 1/2] Shellcheck other extensions --- lib/linter.sh | 2 +- lib/worker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index d06d44cc..01001be5 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -942,7 +942,7 @@ if [ "$VALIDATE_BASH" == "true" ]; then # Lint the bash files # ####################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh\)\$" "${FILE_ARRAY_BASH[@]}" + LintCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh|bash|dash|ksh\)\$" "${FILE_ARRAY_BASH[@]}" fi ################## diff --git a/lib/worker.sh b/lib/worker.sh index f1283c41..2c76bf21 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -455,7 +455,7 @@ function RunTestCases() { TestCodebase "JSON" "jsonlint" "jsonlint" ".*\.\(json\)\$" "json" TestCodebase "XML" "xmllint" "xmllint" ".*\.\(xml\)\$" "xml" TestCodebase "MARKDOWN" "markdownlint" "markdownlint -c $MD_LINTER_RULES" ".*\.\(md\)\$" "markdown" - TestCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh\)\$" "shell" + TestCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh|bash|dash|ksh\)\$" "shell" TestCodebase "PYTHON" "pylint" "pylint --rcfile $PYTHON_LINTER_RULES" ".*\.\(py\)\$" "python" TestCodebase "PERL" "perl" "perl -Mstrict -cw" ".*\.\(pl\)\$" "perl" TestCodebase "PHP" "php" "php -l" ".*\.\(php\)\$" "php" From d02e03878bd9bb0172e84b4eeaeddf160937fc4b Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 6 Jul 2020 15:51:17 -0500 Subject: [PATCH 2/2] Shellcheck other extensions fix --- lib/linter.sh | 2 +- lib/worker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index 01001be5..9f7e816d 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -942,7 +942,7 @@ if [ "$VALIDATE_BASH" == "true" ]; then # Lint the bash files # ####################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh|bash|dash|ksh\)\$" "${FILE_ARRAY_BASH[@]}" + LintCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh\|bash\|dash\|ksh\)\$" "${FILE_ARRAY_BASH[@]}" fi ################## diff --git a/lib/worker.sh b/lib/worker.sh index 2c76bf21..e666494f 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -455,7 +455,7 @@ function RunTestCases() { TestCodebase "JSON" "jsonlint" "jsonlint" ".*\.\(json\)\$" "json" TestCodebase "XML" "xmllint" "xmllint" ".*\.\(xml\)\$" "xml" TestCodebase "MARKDOWN" "markdownlint" "markdownlint -c $MD_LINTER_RULES" ".*\.\(md\)\$" "markdown" - TestCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh|bash|dash|ksh\)\$" "shell" + TestCodebase "BASH" "shellcheck" "shellcheck --color" ".*\.\(sh\|bash\|dash\|ksh\)\$" "shell" TestCodebase "PYTHON" "pylint" "pylint --rcfile $PYTHON_LINTER_RULES" ".*\.\(py\)\$" "python" TestCodebase "PERL" "perl" "perl -Mstrict -cw" ".*\.\(pl\)\$" "perl" TestCodebase "PHP" "php" "php -l" ".*\.\(php\)\$" "php"