Merge from DEV

ct/create_lxc.sh

@@ -15,9 +15,7 @@ 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")
@@ -66,7 +64,7 @@ function spinner() {
 # This function displays an informational message with a yellow color.
 function msg_info() {
   local msg="$1"
-  echo -ne "${TAB}${YW}${msg}"
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
   spinner &
   SPINNER_PID=$!
 }
@@ -141,11 +139,14 @@ function select_storage() {
       "Which storage pool you would like to use for the ${CONTENT_LABEL,,}?\nTo make a selection, use the Spacebar.\n" \
       16 $(($MSG_MAX_LENGTH + 23)) 6 \
       "${MENU[@]}" 3>&1 1>&2 2>&3) || exit "Menu aborted."
+      if [ $? -ne 0 ]; then
+        echo -e "${CROSS}${RD} Menu aborted by user.${CL}"
+        exit 0 
+      fi
     done
-    printf $STORAGE
+    printf "%s" "$STORAGE"
   fi
 }
-
 # Test if required variables are set
 [[ "${CTID:-}" ]] || exit "You need to set 'CTID' variable."
 [[ "${PCT_OSTYPE:-}" ]] || exit "You need to set 'PCT_OSTYPE' variable."

misc/build.func

@@ -91,7 +91,7 @@ spinner() {
 # This function displays an informational message with a yellow color.
 msg_info() {
   local msg="$1"
-  echo -ne "${TAB}${YW}${msg}"
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
   spinner &
   SPINNER_PID=$!
 }
@@ -185,7 +185,7 @@ base_settings() {
   DISK_SIZE="4"
   CORE_COUNT="1"
   RAM_SIZE="1024"
-  VERBOSE="no"
+  VERBOSE="${1:-no}"
   PW=""
   CT_ID=$NEXTID
   HN=$NSAPP
@@ -587,21 +587,56 @@ install_script() {
   NEXTID=$(pvesh get /cluster/nextid)
   timezone=$(cat /etc/timezone)
   header_info
-  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
+  while true; do
+    CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --menu "Choose an option:" \
+      12 50 4 \
+      "1" "Default Settings" \
+      "2" "Default Settings (with verbose)" \
+      "3" "Advanced Settings" \
+      "4" "Exit" --nocancel --default-item "1" 3>&1 1>&2 2>&3)
+
+    if [ $? -ne 0 ]; then
+      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}"
-    base_settings
+        VERB="no"
+        base_settings "$VERB"  
         echo_default
-  else
+        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
-  fi
+        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 actual RAM & Cores
-  current_ram=$(free -m | awk '/^Mem:/{print $2}')
+  current_ram=$(free -m | awk 'NR==2{print $2}')
   current_cpu=$(nproc) 
 
   # Check whether the current RAM is less than the required RAM or the CPU cores are less than required

misc/install.func

@@ -17,6 +17,7 @@ color() {
   CL=$(echo "\033[m")
   BFR="\\r\\033[K"
   BOLD=$(echo "\033[1m")
+  HOLD=" "
   TAB="  "
   
   # System
@@ -86,7 +87,7 @@ spinner() {
 # This function displays an informational message with a yellow color.
 msg_info() {
   local msg="$1"
-  echo -ne "${TAB}${YW}${msg}"
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
   spinner &
   SPINNER_PID=$!
 }
@@ -218,11 +219,10 @@ motd_ssh() {
   if [ -f "$MOTD_FILE" ]; then
     # Start MOTD with application info and link
     echo -e "\n${BOLD}${APPLICATION} LXC Container${CL}" > "$MOTD_FILE"
-    echo -e "${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| Project: ${GN}ProxmoxVE ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\n" >> "$MOTD_FILE"
+    echo -e "${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\n" >> "$MOTD_FILE"
 
     # Add system information with icons
-    echo -e "${TAB}${OS}${YW} OS: ${GN}${OS_NAME} ${OS_VERSION}${CL}" >> "$MOTD_FILE"
-    echo -e "${TAB}${OSVERSION}${YW} Version: ${GN}${OS_VERSION}${CL}" >> "$MOTD_FILE"
+    echo -e "${TAB}${OS}${YW} OS: ${GN}${OS_NAME} - Version: ${OS_VERSION}${CL}" >> "$MOTD_FILE"
     echo -e "${TAB}${HOSTNAME}${YW} Hostname: ${GN}$(hostname)${CL}" >> "$MOTD_FILE"
     echo -e "${TAB}${INFO}${YW} IP Address: ${GN}${IP}${CL}" >> "$MOTD_FILE"
   else