actions/superlint
1
0
Fork 0
mirror of https://github.com/super-linter/super-linter.git synced 2024-12-23 07:42:13 -05:00
Code Issues Projects Releases Packages Wiki Activity

Adds JSON to new structure

Browse source 
We implement the same structure for reading the flag with the JSON parser.
This commit is contained in:
Philip Mallegol-Hansen 2020-06-12 10:42:31 -07:00
parent dbfdea2ff3
commit b3dc7159a9
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/linter.sh
View file

@ -710,12 +710,13 @@ GetValidationInfo()
# Convert strings to lowercase # # Convert strings to lowercase #
################################ ################################
VALIDATE_YAML=$(echo "$VALIDATE_YAML" | awk '{print tolower($0)}') VALIDATE_YAML=$(echo "$VALIDATE_YAML" | awk '{print tolower($0)}')
VALIDATE_JSON=$(echo "$VALIDATE_JSON" | awk '{print tolower($0)}')
################################################ ################################################
# Determine if any linters were explicitly set # # Determine if any linters were explicitly set #
################################################ ################################################
ANY_SET="false" ANY_SET="false"
if [[ -n "$VALIDATE_YAML" ]]; then if [[ -n "$VALIDATE_YAML" || -n "$VALIDATE_JSON" ]]; then
ANY_SET="true" ANY_SET="true"
fi fi
@ -733,6 +734,20 @@ GetValidationInfo()
VALIDATE_YAML="true" VALIDATE_YAML="true"
fi fi
####################################
# Validate if we should check JSON #
####################################
if [[ "$ANY_SET" == "true" ]]; then
# Some linter flags were set - only run those set to true
if [[ -z "$VALIDATE_JSON" ]]; then
# JSON flag was not set - default to false
VALIDATE_JSON="false"
fi
else
# No linter flags were set - default all to true
VALIDATE_JSON="true"
fi
####################################### #######################################
# Print which linters we are enabling # # Print which linters we are enabling #
####################################### #######################################
@ -741,20 +756,9 @@ GetValidationInfo()
else else
PRINT_ARRAY+=("- Excluding [YAML] files in code base...") PRINT_ARRAY+=("- Excluding [YAML] files in code base...")
fi fi
if [[ "$VALIDATE_JSON" == "true" ]]; then
###############################
# Convert string to lowercase #
###############################
VALIDATE_JSON=$(echo "$VALIDATE_JSON" | awk '{print tolower($0)}')
######################################
# Validate we should check all files #
######################################
if [[ "$VALIDATE_JSON" != "false" ]]; then
# Set to true
VALIDATE_JSON="$DEFAULT_VALIDATE_LANGUAGE"
PRINT_ARRAY+=("- Validating [JSON] files in code base...") PRINT_ARRAY+=("- Validating [JSON] files in code base...")
else else
# Its false
PRINT_ARRAY+=("- Excluding [JSON] files in code base...") PRINT_ARRAY+=("- Excluding [JSON] files in code base...")
fi fi