common.sh(print_status): modify behavior of reporting about failures.

No functional changes.

Author: php-coder

src/main/scripts/ci/check-build-and-verify.sh

@@ -35,28 +35,28 @@ DANGER_FAIL=
 if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
 
 	mvn --batch-mode checkstyle:check -Dcheckstyle.violationSeverity=warning \
-		>cs.log 2>&1 || CS_FAIL=yes
+		>cs.log 2>&1 || CS_FAIL=fail
 
 	mvn --batch-mode pmd:check \
-		>pmd.log 2>&1 || PMD_FAIL=yes
+		>pmd.log 2>&1 || PMD_FAIL=fail
 
 	mvn --batch-mode codenarc:codenarc -Dcodenarc.maxPriority1Violations=0 -Dcodenarc.maxPriority2Violations=0 -Dcodenarc.maxPriority3Violations=0 \
-		>codenarc.log 2>&1 || CODENARC_FAIL=yes
+		>codenarc.log 2>&1 || CODENARC_FAIL=fail
 
 	mvn --batch-mode license:check \
-		>license.log 2>&1 || LICENSE_FAIL=yes
+		>license.log 2>&1 || LICENSE_FAIL=fail
 
 	mvn --batch-mode sortpom:verify -Dsort.verifyFail=stop \
-		>pom.log || POM_FAIL=yes
+		>pom.log || POM_FAIL=fail
 
 	find src -type f -name '*.html' | xargs bootlint \
-		>bootlint.log 2>&1 || BOOTLINT_FAIL=yes
+		>bootlint.log 2>&1 || BOOTLINT_FAIL=fail
 
 	rflint --error=all --ignore TooFewKeywordSteps --ignore TooManyTestSteps --configure LineTooLong:130 src/test/robotframework \
-		>rflint.log 2>&1 || RFLINT_FAIL=yes
+		>rflint.log 2>&1 || RFLINT_FAIL=fail
 
 	mvn --batch-mode jasmine:test \
-		>jasmine.log 2>&1 || JASMINE_FAIL=yes
+		>jasmine.log 2>&1 || JASMINE_FAIL=fail
 
 	# FIXME: add check for src/main/config/nginx/503.*html
 	# TODO: remove ignoring of error about alt attribute after resolving #314
@@ -70,24 +70,24 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
 			'The first child "option" element of a "select" element with a "required" attribute' \
 			'This document appears to be written in (Danish|Lithuanian)' \
 		--show-warnings \
-		>validator.log 2>&1 || HTML_FAIL=yes
+		>validator.log 2>&1 || HTML_FAIL=fail
 
 	mvn --batch-mode enforcer:enforce \
-		>enforcer.log 2>&1 || ENFORCER_FAIL=yes
+		>enforcer.log 2>&1 || ENFORCER_FAIL=fail
 
 	mvn --batch-mode test -Denforcer.skip=true -Dmaven.resources.skip=true -DskipMinify=true -DdisableXmlReport=false \
-		>test.log 2>&1 || TEST_FAIL=yes
+		>test.log 2>&1 || TEST_FAIL=fail
 
 	# run after tests for getting compiled sources
 	mvn --batch-mode findbugs:check \
-		>findbugs.log 2>&1 || FINDBUGS_FAIL=yes
+		>findbugs.log 2>&1 || FINDBUGS_FAIL=fail
 fi
 
 mvn --batch-mode verify -Denforcer.skip=true -DskipUnitTests=true \
-	>verify-raw.log 2>&1 || VERIFY_FAIL=yes
+	>verify-raw.log 2>&1 || VERIFY_FAIL=fail
 
 if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
-	danger >danger.log 2>&1 || DANGER_FAIL=yes
+	danger >danger.log 2>&1 || DANGER_FAIL=fail
 fi
 
 # Workaround for #538

src/main/scripts/ci/common.sh

@@ -1,10 +1,13 @@
 print_status() {
-	local we_failed="$1"
+	# $1 is empty if check has succeeded
+	# $1 equals to 'fail' if check has failed
+	local result="$1"
 	local msg="$2"
+	
 	local status='SUCCESS'
 	local color=32
 
-	if [ -n "$we_failed" ]; then
+	if [ "$result" = 'fail' ]; then
 		status='FAIL'
 		color=31
 	fi