Update build.func
This commit is contained in:
parent
6f65995191
commit
41d3f8efbb
@ -91,10 +91,10 @@ start_spinner() {
|
|||||||
local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
|
local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
|
||||||
local spin_i=0
|
local spin_i=0
|
||||||
local interval=0.1
|
local interval=0.1
|
||||||
local term_width=$(tput cols)
|
|
||||||
|
|
||||||
{
|
{
|
||||||
while true; do
|
while true; do
|
||||||
|
if [ "${SPINNER_ACTIVE:-0}" -eq 0 ]; then exit; fi
|
||||||
printf "\r\e[2K${frames[spin_i]} ${YW}%b${CL}" "$msg" >&2
|
printf "\r\e[2K${frames[spin_i]} ${YW}%b${CL}" "$msg" >&2
|
||||||
spin_i=$(((spin_i + 1) % ${#frames[@]}))
|
spin_i=$(((spin_i + 1) % ${#frames[@]}))
|
||||||
sleep "$interval"
|
sleep "$interval"
|
||||||
@ -105,49 +105,37 @@ start_spinner() {
|
|||||||
disown "$SPINNER_PID"
|
disown "$SPINNER_PID"
|
||||||
}
|
}
|
||||||
|
|
||||||
msg_info() {
|
stop_spinner() {
|
||||||
local msg="$1"
|
|
||||||
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
|
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
|
||||||
kill "$SPINNER_PID" >/dev/null 2>&1
|
kill "$SPINNER_PID" >/dev/null 2>&1
|
||||||
sleep 0.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
|
wait "$SPINNER_PID" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
SPINNER_ACTIVE=0
|
||||||
|
unset SPINNER_PID
|
||||||
|
}
|
||||||
|
|
||||||
|
msg_info() {
|
||||||
|
local msg="$1"
|
||||||
|
stop_spinner
|
||||||
SPINNER_ACTIVE=1
|
SPINNER_ACTIVE=1
|
||||||
start_spinner "$msg"
|
start_spinner "$msg"
|
||||||
}
|
}
|
||||||
|
|
||||||
msg_ok() {
|
msg_ok() {
|
||||||
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
|
stop_spinner
|
||||||
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
|
|
||||||
|
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
printf "\r\e[2K${CM}${GN}%b${CL}\n" "$msg" >&2
|
printf "\r\e[2K${CM}${GN}%b${CL}\n" "$msg" >&2
|
||||||
unset SPINNER_PID
|
|
||||||
SPINNER_ACTIVE=0
|
|
||||||
log_message "OK" "$msg"
|
log_message "OK" "$msg"
|
||||||
}
|
}
|
||||||
|
|
||||||
msg_error() {
|
msg_error() {
|
||||||
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
|
stop_spinner
|
||||||
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
|
|
||||||
|
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
printf "\r\e[2K${CROSS}${RD}%b${CL}\n" "$msg" >&2
|
printf "\r\e[2K${CROSS}${RD}%b${CL}\n" "$msg" >&2
|
||||||
unset SPINNER_PID
|
|
||||||
SPINNER_ACTIVE=0
|
|
||||||
log_message "ERROR" "$msg"
|
log_message "ERROR" "$msg"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user