From 6c602da50f6f8e329e2d7896289c0a0419f0a6e8 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:22:38 +0200 Subject: [PATCH] Update core.func --- misc/core.func | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/misc/core.func b/misc/core.func index 0f6f05d6..a8774fc2 100644 --- a/misc/core.func +++ b/misc/core.func @@ -327,10 +327,6 @@ fatal() { kill -INT $$ } -# ------------------------------------------------------------------------------ -# Spinner- und Messaging-Framework (TTY-sicher, CI-kompatibel) -# ------------------------------------------------------------------------------ - spinner() { local chars=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏) local i=0 @@ -341,6 +337,11 @@ spinner() { done } +clear_line() { + tput cr 2>/dev/null || echo -en "\r" + tput el 2>/dev/null || echo -en "\033[K" +} + stop_spinner() { local pid="${SPINNER_PID:-}" [[ -z "$pid" && -f /tmp/.spinner.pid ]] && pid=$(&2 + printf "\r\e[2K%s %b" "$HOURGLASS" "${YW}${msg}${CL}" >&2 return fi - # Spinner nur starten, wenn ein echtes TTY und keine SIGTTOU-Gefahr - if [[ -t 1 && ! "$(ps -o stat= -p $$)" =~ T && -z "${NO_SPINNER:-}" ]]; then - color_spinner - spinner & - SPINNER_PID=$! - echo "$SPINNER_PID" >/tmp/.spinner.pid - disown "$SPINNER_PID" 2>/dev/null || true - else - # Fallback: reiner Text - printf "\r\e[2K⏳ %b\n" "${YW}${msg}${CL}" >&2 - fi + color_spinner + spinner & + SPINNER_PID=$! + echo "$SPINNER_PID" >/tmp/.spinner.pid + disown "$SPINNER_PID" 2>/dev/null || true } msg_ok() { @@ -421,11 +415,6 @@ msg_custom() { echo -e "${BFR:-} ${symbol} ${color}${msg}${CL:-\e[0m}" } -clear_line() { - tput cr 2>/dev/null || echo -en "\r" - tput el 2>/dev/null || echo -en "\033[K" -} - # msg_ok() { # local msg="$1" # [[ -z "$msg" ]] && return