From 41d3f8efbb683dbb92879e54146ed26eb559d679 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 26 Mar 2025 17:59:45 +0100
Subject: [PATCH] Update build.func

---
 misc/build.func | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index e33078b..c37752a 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -91,10 +91,10 @@ start_spinner() {
     local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
     local spin_i=0
     local interval=0.1
-    local term_width=$(tput cols)
 
     {
         while true; do
+            if [ "${SPINNER_ACTIVE:-0}" -eq 0 ]; then exit; fi
             printf "\r\e[2K${frames[spin_i]} ${YW}%b${CL}" "$msg" >&2
             spin_i=$(((spin_i + 1) % ${#frames[@]}))
             sleep "$interval"
@@ -105,49 +105,37 @@ start_spinner() {
     disown "$SPINNER_PID"
 }
 
-msg_info() {
-    local msg="$1"
+stop_spinner() {
     if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
         kill "$SPINNER_PID" >/dev/null 2>&1
         sleep 0.1
+        if ps -p "$SPINNER_PID" >/dev/null 2>&1; then
+            kill -9 "$SPINNER_PID" >/dev/null 2>&1
+        fi
         wait "$SPINNER_PID" 2>/dev/null || true
     fi
+    SPINNER_ACTIVE=0
+    unset SPINNER_PID
+}
 
+msg_info() {
+    local msg="$1"
+    stop_spinner
     SPINNER_ACTIVE=1
     start_spinner "$msg"
 }
 
 msg_ok() {
-    if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
-        kill "$SPINNER_PID" >/dev/null 2>&1
-        sleep 0.1
-        if ps -p "$SPINNER_PID" >/dev/null 2>&1; then
-            kill -9 "$SPINNER_PID" >/dev/null 2>&1
-        fi
-        wait "$SPINNER_PID" 2>/dev/null || true
-    fi
-
+    stop_spinner
     local msg="$1"
     printf "\r\e[2K${CM}${GN}%b${CL}\n" "$msg" >&2
-    unset SPINNER_PID
-    SPINNER_ACTIVE=0
     log_message "OK" "$msg"
 }
 
 msg_error() {
-    if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
-        kill "$SPINNER_PID" >/dev/null 2>&1
-        sleep 0.1
-        if ps -p "$SPINNER_PID" >/dev/null 2>&1; then
-            kill -9 "$SPINNER_PID" >/dev/null 2>&1
-        fi
-        wait "$SPINNER_PID" 2>/dev/null || true
-    fi
-
+    stop_spinner
     local msg="$1"
     printf "\r\e[2K${CROSS}${RD}%b${CL}\n" "$msg" >&2
-    unset SPINNER_PID
-    SPINNER_ACTIVE=0
     log_message "ERROR" "$msg"
 }