martin/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE synced 2025-02-07 08:19:17 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge from DEV

Browse Source
This commit is contained in:
CanbiZ 2024-12-12 14:45:54 +01:00 committed by GitHub
parent 7779b1e004
commit 0e461e4839
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
misc/build.func
View File

@ -91,7 +91,7 @@ spinner() {
# This function displays an informational message with a yellow color. # This function displays an informational message with a yellow color.
msg_info() { msg_info() {
local msg="$1" local msg="$1"
echo -ne "${TAB}${YW}${msg}" echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
spinner & spinner &
SPINNER_PID=$! SPINNER_PID=$!
} }
@ -185,7 +185,7 @@ base_settings() {
DISK_SIZE="4" DISK_SIZE="4"
CORE_COUNT="1" CORE_COUNT="1"
RAM_SIZE="1024" RAM_SIZE="1024"
VERBOSE="no" VERBOSE="${1:-no}"
PW="" PW=""
CT_ID=$NEXTID CT_ID=$NEXTID
HN=$NSAPP HN=$NSAPP
@ -587,21 +587,56 @@ install_script() {
NEXTID=$(pvesh get /cluster/nextid) NEXTID=$(pvesh get /cluster/nextid)
timezone=$(cat /etc/timezone) timezone=$(cat /etc/timezone)
header_info header_info
if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then while true; do
header_info CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --menu "Choose an option:" \
echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings${CL}" 12 50 4 \
base_settings "1" "Default Settings" \
echo_default "2" "Default Settings (with verbose)" \
else "3" "Advanced Settings" \
header_info "4" "Exit" --nocancel --default-item "1" 3>&1 1>&2 2>&3)
echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
advanced_settings if [ $? -ne 0 ]; then
fi echo -e "${CROSS}${RD} Menu canceled. Exiting.${CL}"
exit 0
fi
case $CHOICE in
1)
header_info
echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings${CL}"
VERB="no"
base_settings "$VERB"
echo_default
break
;;
2)
header_info
echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings (${SEARCH} Verbose)${CL}"
VERB="yes"
base_settings "$VERB"
echo_default
break
;;
3)
header_info
echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
advanced_settings
break
;;
4)
echo -e "${CROSS}${RD}Exiting.${CL}"
exit 0
;;
*)
echo -e "${CROSS}${RD}Invalid option, please try again.${CL}"
;;
esac
done
} }
check_container_resources() { check_container_resources() {
# Check actual RAM & Cores # Check actual RAM & Cores
current_ram=$(free -m | awk '/^Mem:/{print $2}') current_ram=$(free -m | awk 'NR==2{print $2}')
current_cpu=$(nproc) current_cpu=$(nproc)
# Check whether the current RAM is less than the required RAM or the CPU cores are less than required # Check whether the current RAM is less than the required RAM or the CPU cores are less than required
@ -811,4 +846,4 @@ EOF
if [[ -f /etc/systemd/system/ping-instances.service ]]; then if [[ -f /etc/systemd/system/ping-instances.service ]]; then
systemctl start ping-instances.service systemctl start ping-instances.service
fi fi
} }