Update core.func
This commit is contained in:
parent
689e7ae932
commit
6eb096f8af
@ -447,9 +447,13 @@ spinner() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
stop_spinner() {
|
stop_spinner() {
|
||||||
if [[ -n "$SPINNER_PID" ]]; then
|
local pid="${SPINNER_PID:-}"
|
||||||
kill "$SPINNER_PID" 2>/dev/null
|
[[ -z "$pid" && -f /tmp/spinner.pid ]] && pid=$(</tmp/spinner.pid)
|
||||||
wait "$SPINNER_PID" 2>/dev/null || true
|
|
||||||
|
if [[ -n "$pid" && "$pid" =~ ^[0-9]+$ ]]; then
|
||||||
|
kill "$pid" 2>/dev/null
|
||||||
|
wait "$pid" 2>/dev/null || true
|
||||||
|
rm -f /tmp/spinner.pid
|
||||||
SPINNER_PID=""
|
SPINNER_PID=""
|
||||||
fi
|
fi
|
||||||
printf "\r\033[K\e[?25h" # clear line + show cursor
|
printf "\r\033[K\e[?25h" # clear line + show cursor
|
||||||
@ -460,6 +464,7 @@ msg_info() {
|
|||||||
echo -ne " ${HOLD:-} ${YW}${msg} "
|
echo -ne " ${HOLD:-} ${YW}${msg} "
|
||||||
spinner &
|
spinner &
|
||||||
SPINNER_PID=$!
|
SPINNER_PID=$!
|
||||||
|
echo "$SPINNER_PID" >/tmp/spinner.pid
|
||||||
}
|
}
|
||||||
|
|
||||||
msg_ok() {
|
msg_ok() {
|
||||||
@ -603,3 +608,5 @@ check_or_create_swap() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
trap 'stop_spinner' EXIT INT TERM
|
||||||
|
Loading…
x
Reference in New Issue
Block a user