Minor updates following merge from upstream/master

This commit is contained in:
Kevin Rowlandson 2020-07-03 13:51:00 +01:00
parent 4cbda27751
commit 39159188cd
No known key found for this signature in database
GPG key ID: F33348ACAE26BE84
2 changed files with 4 additions and 7 deletions

View file

@ -264,7 +264,6 @@ GetLinterVersions() {
# Go through the array of linters and print version info #
##########################################################
for LINTER in "${LINTER_ARRAY[@]}"; do
echo "[$LINTER]:"
###################
# Get the version #
###################
@ -287,12 +286,12 @@ GetLinterVersions() {
# Check the shell for errors #
##############################
if [ $ERROR_CODE -ne 0 ] || [ -z "${GET_VERSION_CMD[*]}" ]; then
echo -e "${NC}${F[Y]}WARN!${NC} Failed to get version info for:[$LINTER]${NC}"
echo -e "${NC}[$LINTER]: ${F[Y]}WARN!${NC} Failed to get version info for:${NC}"
else
##########################
# Print the version info #
##########################
echo "[$LINTER]: ${GET_VERSION_CMD[*]}"
echo -e "${NC}${F[B]}Successfully found version for ${F[W]}[$LINTER]${F[B]}: ${F[W]}${GET_VERSION_CMD[*]}${NC}"
fi
done
#########################

View file

@ -55,8 +55,7 @@ function LintCodebase() {
else
# Success
if [[ $ACTIONS_RUNNER_DEBUG == "true" ]]; then
echo -e "${NC}${F[B]}Successfully found binary for ${F[W]}[$LINTER_NAME]${F[B]} in system${NC}"
echo "Location:[$VALIDATE_INSTALL_CMD]"
echo -e "${NC}${F[B]}Successfully found binary for ${F[W]}[$LINTER_NAME]${F[B]} in system location: ${F[W]}[$VALIDATE_INSTALL_CMD]${NC}"
fi
fi
@ -250,8 +249,7 @@ function TestCodebase() {
exit 1
else
# Success
echo -e "${NC}${F[B]}Successfully found binary in system${NC}"
echo "Location:[$VALIDATE_INSTALL_CMD]"
echo -e "${NC}${F[B]}Successfully found binary for ${F[W]}[$LINTER_NAME]${F[B]} in system location: ${F[W]}[$VALIDATE_INSTALL_CMD]${NC}"
fi
##########################