This commit is contained in:
CanbiZ
2025-05-07 13:43:15 +02:00
parent bd52bbc4ba
commit 2eb8388fc7
5 changed files with 170 additions and 155 deletions

View File

@@ -4,37 +4,40 @@
# License: MIT
# https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/core.func)
load_functions
# This function sets color variables for formatting output in the terminal
color() {
# Colors
YW=$(echo "\033[33m")
YWB=$(echo "\033[93m")
BL=$(echo "\033[36m")
RD=$(echo "\033[01;31m")
GN=$(echo "\033[1;92m")
# color() {
# # Colors
# YW=$(echo "\033[33m")
# YWB=$(echo "\033[93m")
# BL=$(echo "\033[36m")
# RD=$(echo "\033[01;31m")
# GN=$(echo "\033[1;92m")
# Formatting
CL=$(echo "\033[m")
BFR="\\r\\033[K"
BOLD=$(echo "\033[1m")
TAB=" "
# # Formatting
# CL=$(echo "\033[m")
# BFR="\\r\\033[K"
# BOLD=$(echo "\033[1m")
# TAB=" "
# System
RETRY_NUM=10
RETRY_EVERY=3
i=$RETRY_NUM
# # System
# RETRY_NUM=10
# RETRY_EVERY=3
# i=$RETRY_NUM
# Icons
CM="${TAB}✔️${TAB}${CL}"
CROSS="${TAB}✖️${TAB}${CL}"
INFO="${TAB}💡${TAB}${CL}"
NETWORK="${TAB}📡${TAB}${CL}"
OS="${TAB}🖥️${TAB}${CL}"
OSVERSION="${TAB}🌟${TAB}${CL}"
HOSTNAME="${TAB}🏠${TAB}${CL}"
GATEWAY="${TAB}🌐${TAB}${CL}"
DEFAULT="${TAB}⚙️${TAB}${CL}"
}
# # Icons
# CM="${TAB}✔️${TAB}${CL}"
# CROSS="${TAB}✖️${TAB}${CL}"
# INFO="${TAB}💡${TAB}${CL}"
# NETWORK="${TAB}📡${TAB}${CL}"
# OS="${TAB}🖥️${TAB}${CL}"
# OSVERSION="${TAB}🌟${TAB}${CL}"
# HOSTNAME="${TAB}🏠${TAB}${CL}"
# GATEWAY="${TAB}🌐${TAB}${CL}"
# DEFAULT="${TAB}⚙️${TAB}${CL}"
# }
# Function to set STD mode based on verbosity
set_std_mode() {
@@ -78,78 +81,78 @@ error_handler() {
[[ -n "${SPINNER_PID:-}" ]] && kill "$SPINNER_PID" &>/dev/null || true
}
# This function displays an informational message with logging support.
declare -A MSG_INFO_SHOWN
SPINNER_ACTIVE=0
SPINNER_PID=""
SPINNER_MSG=""
# # This function displays an informational message with logging support.
# declare -A MSG_INFO_SHOWN
# SPINNER_ACTIVE=0
# SPINNER_PID=""
# SPINNER_MSG=""
trap 'stop_spinner' EXIT INT TERM HUP
# trap 'stop_spinner' EXIT INT TERM HUP
start_spinner() {
local msg="$1"
local frames=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏)
local spin_i=0
local interval=0.1
# start_spinner() {
# local msg="$1"
# local frames=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏)
# local spin_i=0
# local interval=0.1
SPINNER_MSG="$msg"
printf "\r\e[2K" >&2
# SPINNER_MSG="$msg"
# printf "\r\e[2K" >&2
{
while [[ "$SPINNER_ACTIVE" -eq 1 ]]; do
printf "\r\e[2K%s %b" "${frames[spin_i]}" "${YW}${SPINNER_MSG}${CL}" >&2
spin_i=$(((spin_i + 1) % ${#frames[@]}))
sleep "$interval"
done
} &
# {
# while [[ "$SPINNER_ACTIVE" -eq 1 ]]; do
# printf "\r\e[2K%s %b" "${frames[spin_i]}" "${YW}${SPINNER_MSG}${CL}" >&2
# spin_i=$(((spin_i + 1) % ${#frames[@]}))
# sleep "$interval"
# done
# } &
SPINNER_PID=$!
disown "$SPINNER_PID"
}
# SPINNER_PID=$!
# disown "$SPINNER_PID"
# }
stop_spinner() {
if [[ ${SPINNER_PID+v} && -n "$SPINNER_PID" ]] && 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
wait "$SPINNER_PID" 2>/dev/null || true
fi
SPINNER_ACTIVE=0
unset SPINNER_PID
}
# stop_spinner() {
# if [[ ${SPINNER_PID+v} && -n "$SPINNER_PID" ]] && 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
# wait "$SPINNER_PID" 2>/dev/null || true
# fi
# SPINNER_ACTIVE=0
# unset SPINNER_PID
# }
spinner_guard() {
if [[ "$SPINNER_ACTIVE" -eq 1 ]] && [[ -n "$SPINNER_PID" ]]; then
kill "$SPINNER_PID" 2>/dev/null
wait "$SPINNER_PID" 2>/dev/null || true
SPINNER_ACTIVE=0
unset SPINNER_PID
fi
}
# spinner_guard() {
# if [[ "$SPINNER_ACTIVE" -eq 1 ]] && [[ -n "$SPINNER_PID" ]]; then
# kill "$SPINNER_PID" 2>/dev/null
# wait "$SPINNER_PID" 2>/dev/null || true
# SPINNER_ACTIVE=0
# unset SPINNER_PID
# fi
# }
msg_info() {
local msg="$1"
[[ -n "${MSG_INFO_SHOWN["$msg"]+x}" ]] && return
MSG_INFO_SHOWN["$msg"]=1
# msg_info() {
# local msg="$1"
# [[ -n "${MSG_INFO_SHOWN["$msg"]+x}" ]] && return
# MSG_INFO_SHOWN["$msg"]=1
spinner_guard
SPINNER_ACTIVE=1
start_spinner "$msg"
}
# spinner_guard
# SPINNER_ACTIVE=1
# start_spinner "$msg"
# }
msg_ok() {
local msg="$1"
stop_spinner
printf "\r\e[2K%s %b\n" "${CM}" "${GN}${msg}${CL}" >&2
unset MSG_INFO_SHOWN["$msg"]
}
# msg_ok() {
# local msg="$1"
# stop_spinner
# printf "\r\e[2K%s %b\n" "${CM}" "${GN}${msg}${CL}" >&2
# unset MSG_INFO_SHOWN["$msg"]
# }
msg_error() {
stop_spinner
local msg="$1"
printf "\r\e[2K%s %b\n" "${CROSS}" "${RD}${msg}${CL}" >&2
#log_message "ERROR" "$msg"
}
# msg_error() {
# stop_spinner
# local msg="$1"
# printf "\r\e[2K%s %b\n" "${CROSS}" "${RD}${msg}${CL}" >&2
# #log_message "ERROR" "$msg"
# }
# This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection
setting_up_container() {