From 3a35e86775e7572696e3c84668366041cf4fa9a6 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 21 Jul 2020 11:09:05 -0500 Subject: [PATCH] super clean --- lib/linter.sh | 9 +++--- lib/validation.sh | 70 +++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index b9764a5f..030bb170 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -141,8 +141,7 @@ VALIDATE_JAVASCRIPT_STANDARD="${VALIDATE_JAVASCRIPT_STANDARD}" # Boolean to vali VALIDATE_JSON="${VALIDATE_JSON}" # Boolean to validate language VALIDATE_JSX="${VALIDATE_JSX}" # Boolean to validate language VALIDATE_KOTLIN="${VALIDATE_KOTLIN}" # Boolean to validate language -# shellcheck disable=SC2153 -VALIDATE_MARKDOWN="${VALIDATE_MD}" # Boolean to validate language +VALIDATE_MARKDOWN="${VALIDATE_MD:-}" # Boolean to validate language VALIDATE_OPENAPI="${VALIDATE_OPENAPI}" # Boolean to validate language VALIDATE_PERL="${VALIDATE_PERL}" # Boolean to validate language VALIDATE_PHP="${VALIDATE_PHP}" # Boolean to validate language @@ -598,7 +597,7 @@ GetGitHubVars() { ############################### # Convert string to lowercase # ############################### - TEST_CASE_RUN=$(echo "$TEST_CASE_RUN" | awk '{print tolower($0)}') + TEST_CASE_RUN="${TEST_CASE_RUN,,}" ########################## # Get the run local flag # @@ -613,7 +612,7 @@ GetGitHubVars() { ############################### # Convert string to lowercase # ############################### - RUN_LOCAL=$(echo "$RUN_LOCAL" | awk '{print tolower($0)}') + RUN_LOCAL="${RUN_LOCAL,,}" ################################# # Check if were running locally # @@ -738,7 +737,7 @@ GetGitHubVars() { ############################### # Convert string to lowercase # ############################### - MULTI_STATUS=$(echo "$MULTI_STATUS" | awk '{print tolower($0)}') + MULTI_STATUS="${MULTI_STATUS,,}" ####################################################################### # Check to see if the multi status is set, and we have a token to use # diff --git a/lib/validation.sh b/lib/validation.sh index 526a6e2c..9be40a60 100755 --- a/lib/validation.sh +++ b/lib/validation.sh @@ -24,7 +24,7 @@ function GetValidationInfo() { ############################### # Convert string to lowercase # ############################### - VALIDATE_ALL_CODEBASE=$(echo "$VALIDATE_ALL_CODEBASE" | awk '{print tolower($0)}') + VALIDATE_ALL_CODEBASE="${VALIDATE_ALL_CODEBASE,,}" ###################################### # Validate we should check all files # ###################################### @@ -46,38 +46,38 @@ function GetValidationInfo() { ################################ # Convert strings to lowercase # ################################ - VALIDATE_ANSIBLE=$(echo "$VALIDATE_ANSIBLE" | awk '{print tolower($0)}') - VALIDATE_ARM=$(echo "$VALIDATE_ARM" | awk '{print tolower($0)}') - VALIDATE_BASH=$(echo "$VALIDATE_BASH" | awk '{print tolower($0)}') - VALIDATE_CLOJURE=$(echo "$VALIDATE_CLOJURE" | awk '{print tolower($0)}') - VALIDATE_COFFEE=$(echo "$VALIDATE_COFFEE" | awk '{print tolower($0)}') - VALIDATE_CSS=$(echo "$VALIDATE_CSS" | awk '{print tolower($0)}') - VALIDATE_DART=$(echo "$VALIDATE_DART" | awk '{print tolower($0)}') - VALIDATE_DOCKER=$(echo "$VALIDATE_DOCKER" | awk '{print tolower($0)}') - VALIDATE_EDITORCONFIG=$(echo "$VALIDATE_EDITORCONFIG" | awk '{print tolower($0)}') - VALIDATE_ENV=$(echo "$VALIDATE_ENV" | awk '{print tolower($0)}') - VALIDATE_GO=$(echo "$VALIDATE_GO" | awk '{print tolower($0)}') - VALIDATE_HTML=$(echo "$VALIDATE_HTML" | awk '{print tolower($0)}') - VALIDATE_JAVASCRIPT_ES=$(echo "$VALIDATE_JAVASCRIPT_ES" | awk '{print tolower($0)}') - VALIDATE_JAVASCRIPT_STANDARD=$(echo "$VALIDATE_JAVASCRIPT_STANDARD" | awk '{print tolower($0)}') - VALIDATE_JSON=$(echo "$VALIDATE_JSON" | awk '{print tolower($0)}') - VALIDATE_JSX=$(echo "$VALIDATE_JSX" | awk '{print tolower($0)}') - VALIDATE_KOTLIN=$(echo "$VALIDATE_KOTLIN" | awk '{print tolower($0)}') - VALIDATE_MARKDOWN=$(echo "$VALIDATE_MARKDOWN" | awk '{print tolower($0)}') - VALIDATE_OPENAPI=$(echo "$VALIDATE_OPENAPI" | awk '{print tolower($0)}') - VALIDATE_PERL=$(echo "$VALIDATE_PERL" | awk '{print tolower($0)}') - VALIDATE_PHP=$(echo "$VALIDATE_PHP" | awk '{print tolower($0)}') - VALIDATE_POWERSHELL=$(echo "$VALIDATE_POWERSHELL" | awk '{print tolower($0)}') - VALIDATE_PROTOBUF=$(echo "$VALIDATE_PROTOBUF" | awk '{print tolower($0)}') - VALIDATE_PYTHON=$(echo "$VALIDATE_PYTHON" | awk '{print tolower($0)}') - VALIDATE_RAKU=$(echo "$VALIDATE_RAKU" | awk '{print tolower($0)}') - VALIDATE_RUBY=$(echo "$VALIDATE_RUBY" | awk '{print tolower($0)}') - VALIDATE_TERRAFORM=$(echo "$VALIDATE_TERRAFORM" | awk '{print tolower($0)}') - VALIDATE_TSX=$(echo "$VALIDATE_TSX" | awk '{print tolower($0)}') - VALIDATE_TYPESCRIPT_ES=$(echo "$VALIDATE_TYPESCRIPT_ES" | awk '{print tolower($0)}') - VALIDATE_TYPESCRIPT_STANDARD=$(echo "$VALIDATE_TYPESCRIPT_STANDARD" | awk '{print tolower($0)}') - VALIDATE_YAML=$(echo "$VALIDATE_YAML" | awk '{print tolower($0)}') - VALIDATE_XML=$(echo "$VALIDATE_XML" | awk '{print tolower($0)}') + VALIDATE_ANSIBLE="${VALIDATE_ANSIBLE,,}" + VALIDATE_ARM="${VALIDATE_ARM,,}" + VALIDATE_BASH="${VALIDATE_BASH,,}" + VALIDATE_CLOJURE="${VALIDATE_CLOJURE,,}" + VALIDATE_COFFEE="${VALIDATE_COFFEE,,}" + VALIDATE_CSS="${VALIDATE_CSS,,}" + VALIDATE_DART="${VALIDATE_DART,,}" + VALIDATE_DOCKER="${VALIDATE_DOCKER,,}" + VALIDATE_EDITORCONFIG="${VALIDATE_EDITORCONFIG,,}" + VALIDATE_ENV="${VALIDATE_ENV,,}" + VALIDATE_GO="${VALIDATE_GO,,}" + VALIDATE_HTML="${VALIDATE_HTML,,}" + VALIDATE_JAVASCRIPT_ES="${VALIDATE_JAVASCRIPT_ES,,}" + VALIDATE_JAVASCRIPT_STANDARD="${VALIDATE_JAVASCRIPT_STANDARD,,}" + VALIDATE_JSON="${VALIDATE_JSON,,}" + VALIDATE_JSX="${VALIDATE_JSX,,}" + VALIDATE_KOTLIN="${VALIDATE_KOTLIN,,}" + VALIDATE_MARKDOWN="${VALIDATE_MARKDOWN,,}" + VALIDATE_OPENAPI="${VALIDATE_OPENAPI,,}" + VALIDATE_PERL="${VALIDATE_PERL,,}" + VALIDATE_PHP="${VALIDATE_PHP,,}" + VALIDATE_POWERSHELL="${VALIDATE_POWERSHELL,,}" + VALIDATE_PROTOBUF="${VALIDATE_PROTOBUF,,}" + VALIDATE_PYTHON="${VALIDATE_PYTHON,,}" + VALIDATE_RAKU="${VALIDATE_RAKU,,}" + VALIDATE_RUBY="${VALIDATE_RUBY,,}" + VALIDATE_TERRAFORM="${VALIDATE_TERRAFORM,,}" + VALIDATE_TSX="${VALIDATE_TSX,,}" + VALIDATE_TYPESCRIPT_ES="${VALIDATE_TYPESCRIPT_ES,,}" + VALIDATE_TYPESCRIPT_STANDARD="${VALIDATE_TYPESCRIPT_STANDARD,,}" + VALIDATE_YAML="${VALIDATE_YAML,,}" + VALIDATE_XML="${VALIDATE_XML,,}" ################################################ # Determine if any linters were explicitly set # @@ -752,7 +752,7 @@ function GetValidationInfo() { ############################### # Convert string to lowercase # ############################### - DISABLE_ERRORS=$(echo "$DISABLE_ERRORS" | awk '{print tolower($0)}') + DISABLE_ERRORS="${DISABLE_ERRORS,,}" ############################ # Set to false if not true # @@ -774,7 +774,7 @@ function GetValidationInfo() { ############################### # Convert string to lowercase # ############################### - ACTIONS_RUNNER_DEBUG=$(echo "$ACTIONS_RUNNER_DEBUG" | awk '{print tolower($0)}') + ACTIONS_RUNNER_DEBUG="${ACTIONS_RUNNER_DEBUG,,}" ############################ # Set to true if not false #