Revert some changes
This commit is contained in:
		
							parent
							
								
									20c9572c90
								
							
						
					
					
						commit
						a7d0df0234
					
				| @ -1204,9 +1204,7 @@ build_container() { | ||||
|   if [ "$var_os" == "alpine" ]; then | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/alpine-install.func)" | ||||
|   else | ||||
|     FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/core.func)" | ||||
|     FUNCTIONS_FILE_PATH+="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/install.func)" | ||||
|     export FUNCTIONS_FILE_PATH | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/install.func)" | ||||
|   fi | ||||
|   export RANDOM_UUID="$RANDOM_UUID" | ||||
|   export CACHER="$APT_CACHER" | ||||
|  | ||||
| @ -1,4 +1,3 @@ | ||||
| # Why dose it error out? | ||||
| # Copyright (c) 2021-2025 tteck | ||||
| # Author: tteck (tteckster) | ||||
| # Co-Author: MickLesk | ||||
| @ -6,6 +5,148 @@ | ||||
| # License: MIT | ||||
| # https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE | ||||
| 
 | ||||
| color() { | ||||
|   # Colors | ||||
|   YW=$(echo "\033[33m") | ||||
|   YWB=$(echo "\033[93m") | ||||
|   BL=$(echo "\033[36m") | ||||
|   RD=$(echo "\033[01;31m") | ||||
|   BGN=$(echo "\033[4;92m") | ||||
|   GN=$(echo "\033[1;92m") | ||||
|   DGN=$(echo "\033[32m") | ||||
| 
 | ||||
|   # Formatting | ||||
|   CL=$(echo "\033[m") | ||||
|   BOLD=$(echo "\033[1m") | ||||
|   HOLD=" " | ||||
|   TAB="  " | ||||
| 
 | ||||
|   # Icons | ||||
|   CM="${TAB}✔️${TAB}" | ||||
|   CROSS="${TAB}✖️${TAB}${CL}" | ||||
|   INFO="${TAB}💡${TAB}${CL}" | ||||
|   OS="${TAB}🖥️${TAB}${CL}" | ||||
|   OSVERSION="${TAB}🌟${TAB}${CL}" | ||||
|   CONTAINERTYPE="${TAB}📦${TAB}${CL}" | ||||
|   DISKSIZE="${TAB}💾${TAB}${CL}" | ||||
|   CPUCORE="${TAB}🧠${TAB}${CL}" | ||||
|   RAMSIZE="${TAB}🛠️${TAB}${CL}" | ||||
|   SEARCH="${TAB}🔍${TAB}${CL}" | ||||
|   VERBOSE_CROPPED="🔍${TAB}" | ||||
|   VERIFYPW="${TAB}🔐${TAB}${CL}" | ||||
|   CONTAINERID="${TAB}🆔${TAB}${CL}" | ||||
|   HOSTNAME="${TAB}🏠${TAB}${CL}" | ||||
|   BRIDGE="${TAB}🌉${TAB}${CL}" | ||||
|   NETWORK="${TAB}📡${TAB}${CL}" | ||||
|   GATEWAY="${TAB}🌐${TAB}${CL}" | ||||
|   DISABLEIPV6="${TAB}🚫${TAB}${CL}" | ||||
|   DEFAULT="${TAB}⚙️${TAB}${CL}" | ||||
|   MACADDRESS="${TAB}🔗${TAB}${CL}" | ||||
|   VLANTAG="${TAB}🏷️${TAB}${CL}" | ||||
|   ROOTSSH="${TAB}🔑${TAB}${CL}" | ||||
|   CREATING="${TAB}🚀${TAB}${CL}" | ||||
|   ADVANCED="${TAB}🧩${TAB}${CL}" | ||||
|   FUSE="${TAB}🔧${TAB}${CL}" | ||||
| } | ||||
| 
 | ||||
| declare -A MSG_INFO_SHOWN | ||||
| SPINNER_ACTIVE=0 | ||||
| SPINNER_PID="" | ||||
| SPINNER_MSG="" | ||||
| 
 | ||||
| start_spinner() { | ||||
|   local msg="$1" | ||||
|   local frames=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏) | ||||
|   local spin_i=0 | ||||
|   local interval=0.1 | ||||
| 
 | ||||
|   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 | ||||
|   } & | ||||
| 
 | ||||
|   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 | ||||
| } | ||||
| 
 | ||||
| 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 | ||||
| } | ||||
| 
 | ||||
| log_message() { | ||||
|   local level="$1" | ||||
|   local message="$2" | ||||
|   local timestamp | ||||
|   local logdate | ||||
|   timestamp=$(date '+%Y-%m-%d %H:%M:%S') | ||||
|   logdate=$(date '+%Y-%m-%d') | ||||
| 
 | ||||
|   LOGDIR="/usr/local/community-scripts/logs" | ||||
|   mkdir -p "$LOGDIR" | ||||
| 
 | ||||
|   LOGFILE="${LOGDIR}/${logdate}_${NSAPP}.log" | ||||
|   echo "$timestamp - $level: $message" >>"$LOGFILE" | ||||
| } | ||||
| 
 | ||||
| msg_info() { | ||||
|   local msg="$1" | ||||
|   if [ "${SPINNER_ACTIVE:-0}" -eq 1 ]; then | ||||
|     return | ||||
|   fi | ||||
| 
 | ||||
|   SPINNER_ACTIVE=1 | ||||
|   start_spinner "$msg" | ||||
| } | ||||
| 
 | ||||
| msg_ok() { | ||||
|   if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then | ||||
|     kill "$SPINNER_PID" >/dev/null 2>&1 | ||||
|     wait "$SPINNER_PID" 2>/dev/null || true | ||||
|   fi | ||||
| 
 | ||||
|   local msg="$1" | ||||
|   printf "\r\e[2K${CM}${GN}%b${CL}\n" "$msg" >&2 | ||||
|   unset SPINNER_PID | ||||
|   SPINNER_ACTIVE=0 | ||||
| 
 | ||||
|   log_message "OK" "$msg" | ||||
| } | ||||
| 
 | ||||
| msg_error() { | ||||
|   if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then | ||||
|     kill "$SPINNER_PID" >/dev/null 2>&1 | ||||
|     wait "$SPINNER_PID" 2>/dev/null || true | ||||
|   fi | ||||
| 
 | ||||
|   local msg="$1" | ||||
|   printf "\r\e[2K${CROSS}${RD}%b${CL}\n" "$msg" >&2 | ||||
|   unset SPINNER_PID | ||||
|   SPINNER_ACTIVE=0 | ||||
|   log_message "ERROR" "$msg" | ||||
| } | ||||
| 
 | ||||
| verb_ip6() { | ||||
|   set_std_mode # Set STD mode based on VERBOSE | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user