Compare commits
No commits in common. "dae20358d32606fea7838947f337a8c4e6195f6c" and "7239210eadee9fc3c4b7a829e7293cf8df81298a" have entirely different histories.
dae20358d3
...
7239210ead
@ -250,18 +250,14 @@ start_spinner() {
|
||||
stop_spinner() {
|
||||
if [ "$SPINNER_ACTIVE" -eq 1 ] && [ -n "$SPINNER_PID" ]; then
|
||||
SPINNER_ACTIVE=0
|
||||
|
||||
if kill -0 "$SPINNER_PID" 2>/dev/null; then
|
||||
kill "$SPINNER_PID" 2>/dev/null
|
||||
sleep 0.1
|
||||
kill -0 "$SPINNER_PID" 2>/dev/null && kill -9 "$SPINNER_PID" 2>/dev/null
|
||||
if ps -p "$SPINNER_PID" >/dev/null 2>&1; then
|
||||
if grep -qE "\<$SPINNER_PID\>" "/proc/$$/task/$$/children" 2>/dev/null; then
|
||||
wait "$SPINNER_PID" 2>/dev/null || true
|
||||
fi
|
||||
wait "$SPINNER_PID" 2>/dev/null || true
|
||||
fi
|
||||
fi
|
||||
|
||||
printf "\r\e[2K" >&2
|
||||
SPINNER_PID=""
|
||||
fi
|
||||
@ -288,12 +284,7 @@ msg_ok() {
|
||||
local msg="$1"
|
||||
[ -z "$msg" ] && return
|
||||
|
||||
if [ "$SPINNER_ACTIVE" -eq 1 ]; then
|
||||
stop_spinner
|
||||
else
|
||||
printf "\r\e[2K" >&2
|
||||
fi
|
||||
|
||||
stop_spinner
|
||||
printf "\r\e[2K%s %b\n" "$CM" "${GN}${msg}${CL}" >&2
|
||||
unset MSG_INFO_SHOWN["$msg"]
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user