refine script log formatting

Author: Arlowen

scripts/install.sh

@@ -9,26 +9,31 @@ _log() {
   shift 3
 
   local line
-  line="$(date '+%Y-%m-%d %H:%M:%S') [${level}] $*"
+  local now
+  now="$(date '+%Y-%m-%d %H:%M:%S')"
+  line="${now} [${level}] $*"
+  local label
+  label="[${level}]"
 
   if [[ "$stream" == "stderr" ]]; then
     if [[ -t 2 ]]; then
-      printf '\033[%sm%s\033[0m\n' "$color" "$line" >&2
+      printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*" >&2
     else
       printf '%s\n' "$line" >&2
     fi
     return
   fi
 
   if [[ -t 1 ]]; then
-    printf '\033[%sm%s\033[0m\n' "$color" "$line"
+    printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*"
     return
   fi
 
   printf '%s\n' "$line"
 }
 
 log_info()    { _log "INFO" "32" "stdout" "$@"; }
+log_warn()    { _log "WARN" "33" "stdout" "$@"; }
 log_success() { log_info "$@"; }
 log_error()   { _log "ERROR" "31" "stderr" "$@"; }
 

scripts/lib/log.sh

@@ -12,25 +12,28 @@ _log() {
   now="$(date '+%Y-%m-%d %H:%M:%S')"
   local line
   line="${now} [${level}] $*"
+  local label
+  label="[${level}]"
 
   if [[ "$stream" == "stderr" ]]; then
     if [[ -t 2 ]]; then
-      printf '\033[%sm%s\033[0m\n' "$color" "$line" >&2
+      printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*" >&2
     else
       printf '%s\n' "$line" >&2
     fi
     return
   fi
 
   if [[ -t 1 ]]; then
-    printf '\033[%sm%s\033[0m\n' "$color" "$line"
+    printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*"
     return
   fi
 
   printf '%s\n' "$line"
 }
 
 log_info()    { _log "INFO" "32" "stdout" "$@"; }
+log_warn()    { _log "WARN" "33" "stdout" "$@"; }
 log_success() { log_info "$@"; }
 log_error()   { _log "ERROR" "31" "stderr" "$@"; }
 

scripts/uninstall.sh

@@ -9,26 +9,31 @@ _log() {
   shift 3
 
   local line
-  line="$(date '+%Y-%m-%d %H:%M:%S') [${level}] $*"
+  local now
+  now="$(date '+%Y-%m-%d %H:%M:%S')"
+  line="${now} [${level}] $*"
+  local label
+  label="[${level}]"
 
   if [[ "$stream" == "stderr" ]]; then
     if [[ -t 2 ]]; then
-      printf '\033[%sm%s\033[0m\n' "$color" "$line" >&2
+      printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*" >&2
     else
       printf '%s\n' "$line" >&2
     fi
     return
   fi
 
   if [[ -t 1 ]]; then
-    printf '\033[%sm%s\033[0m\n' "$color" "$line"
+    printf '%s \033[%sm%s\033[0m %s\n' "$now" "$color" "$label" "$*"
     return
   fi
 
   printf '%s\n' "$line"
 }
 
 log_info()    { _log "INFO" "32" "stdout" "$@"; }
+log_warn()    { _log "WARN" "33" "stdout" "$@"; }
 log_success() { log_info "$@"; }
 log_error()   { _log "ERROR" "31" "stderr" "$@"; }