Update core.func
This commit is contained in:
parent
4bd4f3d9cd
commit
937d2f574c
@ -240,8 +240,8 @@ start_spinner() {
|
|||||||
SPINNER_ACTIVE=1
|
SPINNER_ACTIVE=1
|
||||||
|
|
||||||
{
|
{
|
||||||
while [ "$SPINNER_ACTIVE" -eq 1 ]; do
|
while [[ "$SPINNER_ACTIVE" -eq 1 ]]; do
|
||||||
if [ -t 2 ]; then
|
if [[ -t 2 ]]; then
|
||||||
printf "\r\e[2K%s %b" "${TAB}${spinner_frames[spin_i]}${TAB}" "${YW}${SPINNER_MSG}${CL}" >&2
|
printf "\r\e[2K%s %b" "${TAB}${spinner_frames[spin_i]}${TAB}" "${YW}${SPINNER_MSG}${CL}" >&2
|
||||||
else
|
else
|
||||||
printf "%s...\n" "$SPINNER_MSG" >&2
|
printf "%s...\n" "$SPINNER_MSG" >&2
|
||||||
@ -255,14 +255,13 @@ start_spinner() {
|
|||||||
local pid=$!
|
local pid=$!
|
||||||
if kill -0 "$pid" 2>/dev/null; then
|
if kill -0 "$pid" 2>/dev/null; then
|
||||||
SPINNER_PID="$pid"
|
SPINNER_PID="$pid"
|
||||||
disown "$SPINNER_PID" 2>/dev/null || true
|
|
||||||
else
|
else
|
||||||
SPINNER_ACTIVE=0
|
SPINNER_ACTIVE=0
|
||||||
SPINNER_PID=""
|
SPINNER_PID=""
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# === Spinner Stop (No wait!) ===
|
# === Spinner Stop ===
|
||||||
stop_spinner() {
|
stop_spinner() {
|
||||||
if [[ "$SPINNER_ACTIVE" -eq 1 && -n "$SPINNER_PID" ]]; then
|
if [[ "$SPINNER_ACTIVE" -eq 1 && -n "$SPINNER_PID" ]]; then
|
||||||
SPINNER_ACTIVE=0
|
SPINNER_ACTIVE=0
|
||||||
@ -275,7 +274,7 @@ stop_spinner() {
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$SPINNER_PID" =~ ^[0-9]+$ ]]; then
|
if [[ "$SPINNER_PID" =~ ^[0-9]+$ ]] && ps -p "$SPINNER_PID" -o pid= >/dev/null 2>&1; then
|
||||||
wait "$SPINNER_PID" 2>/dev/null || true
|
wait "$SPINNER_PID" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user