From 39159188cd706c55e7aca3196043e8e29443b0d9 Mon Sep 17 00:00:00 2001
From: Kevin Rowlandson <kevin.rowlandson@microsoft.com>
Date: Fri, 3 Jul 2020 13:51:00 +0100
Subject: [PATCH] Minor updates following merge from upstream/master

---
 lib/linter.sh | 5 ++---
 lib/worker.sh | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/linter.sh b/lib/linter.sh
index b575192a..660f44eb 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -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
   #########################
diff --git a/lib/worker.sh b/lib/worker.sh
index ae655250..4c5b1cd8 100755
--- a/lib/worker.sh
+++ b/lib/worker.sh
@@ -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
 
   ##########################