ref(14): Refactor log with printf in place of echo

scalastic · Apr 28, 2024 · 2cd65ef · 2cd65ef
1 parent 7e640ef
commit 2cd65ef
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/lib/log.sh b/src/lib/log.sh
@@ -79,7 +79,8 @@ log__log() {
     fi
 
     if [ "$LOG_LEVEL" -le "$level" ]; then
-        echo -e "${color}[${LOG_LEVELS[$level]}] $message${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+        #echo -e "${color}[${LOG_LEVELS[$level]}] $message${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+        printf "%b[%s] %s%b\n" "$color" "${LOG_LEVELS[$level]}" "$message" "$color_off" | tee -a "${LOG_PATH}/stdout.log" >&2
     fi
 }
 
@@ -102,9 +103,14 @@ log__banner() {
       return 2
     fi
 
-    echo -e "${color}################################${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
-    echo -e "${color} $message${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
-    echo -e "${color}################################${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+    #echo -e "${color}################################${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+    #echo -e "${color} $message${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+    #echo -e "${color}################################${color_off}" | tee -a "${LOG_PATH}/stdout.log" >&2
+
+    printf "%b################################%b\n" "$color" "$color_off" | tee -a "${LOG_PATH}/stdout.log" >&2
+    printf "%b %s%b\n" "$color" "$message" "$color_off" | tee -a "${LOG_PATH}/stdout.log" >&2
+    printf "%b################################%b\n" "$color" "$color_off" | tee -a "${LOG_PATH}/stdout.log" >&2
+
 }
 
 

diff --git a/test/action/bash-version.sh b/test/action/bash-version.sh
@@ -3,4 +3,8 @@
 
 set -euo pipefail
 
+LOG_PATH="./log"
+source ./src/lib/log.sh
+
+log_info "Running bash --version..."
 bash --version
diff --git a/test/action/maven-version.sh b/test/action/maven-version.sh
@@ -3,4 +3,8 @@
 
 set -euo pipefail
 
+LOG_PATH="./log"
+source ./src/lib/log.sh
+
+log_info "Running mvn --version..."
 mvn --version