From 67ba7d509d9c19b10be34f531556e6ae677417da Mon Sep 17 00:00:00 2001 From: pika <759349196@qq.com> Date: Thu, 2 Apr 2026 14:04:02 +0800 Subject: [PATCH] refine script log formatting --- scripts/install.sh | 11 ++++++++--- scripts/lib/log.sh | 7 +++++-- scripts/uninstall.sh | 11 ++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 4077aee..d4efac2 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -9,11 +9,15 @@ _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 @@ -21,7 +25,7 @@ _log() { 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 @@ -29,6 +33,7 @@ _log() { } log_info() { _log "INFO" "32" "stdout" "$@"; } +log_warn() { _log "WARN" "33" "stdout" "$@"; } log_success() { log_info "$@"; } log_error() { _log "ERROR" "31" "stderr" "$@"; } diff --git a/scripts/lib/log.sh b/scripts/lib/log.sh index 1649bab..519e220 100644 --- a/scripts/lib/log.sh +++ b/scripts/lib/log.sh @@ -12,10 +12,12 @@ _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 @@ -23,7 +25,7 @@ _log() { 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 @@ -31,6 +33,7 @@ _log() { } log_info() { _log "INFO" "32" "stdout" "$@"; } +log_warn() { _log "WARN" "33" "stdout" "$@"; } log_success() { log_info "$@"; } log_error() { _log "ERROR" "31" "stderr" "$@"; } diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 14deb4f..7f03176 100755 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -9,11 +9,15 @@ _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 @@ -21,7 +25,7 @@ _log() { 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 @@ -29,6 +33,7 @@ _log() { } log_info() { _log "INFO" "32" "stdout" "$@"; } +log_warn() { _log "WARN" "33" "stdout" "$@"; } log_success() { log_info "$@"; } log_error() { _log "ERROR" "31" "stderr" "$@"; }