Update menus dialog

scripts/customizable_post_install.sh

@@ -279,7 +279,7 @@ apt_upgrade() {
                     progress=$((i * 10))
                     tput cup $((row + 3)) 9 
                     printf "[%-50s] %3d%%" "$(printf "#%.0s" $(seq 1 $((progress/2))))" "$progress"
-                    sleep 0.2  
+                      
                 done
             fi
         done
@@ -2582,20 +2582,17 @@ lvm_repair_check() {
 
 # Main menu function
 main_menu() {
-  local HEADER=$(printf " %-56s %10s" "$(translate "Description")" "Category")
+  local HEADER
+  if [[ "$LANGUAGE" == "es" ]]; then
+    HEADER="Seleccione las opciones a configurar:\n\n           Descripción                                  | Categoría"
+  else
+    HEADER="$(translate "Choose options to configure:")\n\n           Description                                | Category"
+  fi
 
   declare -A category_order=(
-    ["Basic Settings"]=1
+    ["Basic Settings"]=1 ["System"]=2 ["Hardware"]=3 ["Virtualization"]=4
-    ["System"]=2
+    ["Network"]=5 ["Storage"]=6 ["Security"]=7 ["Customization"]=8
-    ["Hardware"]=3
+    ["Monitoring"]=9 ["Performance"]=10 ["Optional"]=11
-    ["Virtualization"]=4
-    ["Network"]=5
-    ["Storage"]=6
-    ["Security"]=7
-    ["Customization"]=8
-    ["Monitoring"]=9
-    ["Performance"]=10
-    ["Optional"]=11
   )
 
   local options=(
@@ -2644,79 +2641,111 @@ main_menu() {
   done | sort -n | cut -d'|' -f2-))
   unset IFS
 
-  local total_width=65
+  local max_desc_length=0
-  local max_desc_width=50
+  local temp_descriptions=()
-  local category_width=15
-  local category_position=$((total_width - category_width))
   
-  local menu_items=()
+  for option in "${sorted_options[@]}"; do
+    IFS='|' read -r category description function_name <<< "$option"
+    local desc_translated="$(translate "$description")"
+    temp_descriptions+=("$desc_translated")
+    
+    local desc_length=${#desc_translated}
+    if [ $desc_length -gt $max_desc_length ]; then
+      max_desc_length=$desc_length
+    fi
+  done
+  
+  if [ $max_desc_length -gt 50 ]; then
+    max_desc_length=50
+  fi
+
+  local checklist_items=()
   local i=1
+  local desc_index=0
   local previous_category=""
 
   for option in "${sorted_options[@]}"; do
     IFS='|' read -r category description function_name <<< "$option"
-    translated_description="$(translate "$description")"
-
-   
-    local max_cut=$((category_position - 3))
-    [[ "$max_cut" -lt 10 ]] && max_cut=10
-    if [[ ${#translated_description} -gt $max_cut ]]; then
-      translated_description="${translated_description:0:$((max_cut - 3))}..."
-    fi
     
 
     if [[ "$category" != "$previous_category" && "$category" == "Optional" && -n "$previous_category" ]]; then
-      menu_items+=("" "================================================================" "")
+      checklist_items+=("" "==============================================================" "")
+    fi
+    
+    local desc_translated="${temp_descriptions[$desc_index]}"
+    desc_index=$((desc_index + 1))
+    
+
+    if [ ${#desc_translated} -gt $max_desc_length ]; then
+      desc_translated="${desc_translated:0:$((max_desc_length-3))}..."
     fi
     
 
-    local line="$translated_description"
+    local spaces_needed=$((max_desc_length - ${#desc_translated}))
-    local spaces_needed=$((category_position - ${#translated_description}))
+    local padding=""
-    for ((j = 0; j < spaces_needed; j++)); do
+    for ((j=0; j<spaces_needed; j++)); do
-      line+=" "
+      padding+=" "
     done
-    line+="$category"
     
-    menu_items+=("$i" "$line" "OFF")
+    local line="${desc_translated}${padding}      | ${category}"
+
+    checklist_items+=("$i" "$line" "off")
     i=$((i + 1))
     previous_category="$category"
   done
 
-  cleanup
+  exec 3>&1
+  selected_indices=$(dialog --clear \
+    --backtitle "ProxMenux" \
+    --title "$(translate "Post-Installation Options")" \
+    --checklist "$HEADER" 22 80 15 \
+    "${checklist_items[@]}" \
+    2>&1 1>&3)
 
-  local selected_indices=$(whiptail --title "$(translate "ProxMenux Custom Script for Post-Installation")" \
+  local dialog_exit=$?
-    --checklist --separate-output \
+  exec 3>&-
-    "\n$HEADER\n\n$(translate "Choose options to configure:")\n$(translate "Use [SPACE] to select/deselect and [ENTER] to confirm:")" \
-    20 82 12 \
-    "${menu_items[@]}" \
-    3>&1 1>&2 2>&3)
 
-
+  if [[ $dialog_exit -ne 0 || -z "$selected_indices" ]]; then
-  if [ $? -ne 0 ]; then
-    echo "User cancelled. Exiting."
     exit 0
   fi
 
 
-  IFS=$'\n' read -d '' -r -a selected_options <<< "$selected_indices"
-  declare -A selected_functions
 
-  if [ -n "$selected_indices" ]; then
+
+declare -A selected_functions
+read -ra indices_array <<< "$selected_indices"
+
+for index in "${indices_array[@]}"; do
+  if [[ -z "$index" ]] || ! [[ "$index" =~ ^[0-9]+$ ]]; then
+    continue
+  fi
+  
+
+  local item_index=$(( (index - 1) * 3 + 1 ))
+  if [[ $item_index -lt ${#checklist_items[@]} ]]; then
+    local selected_line="${checklist_items[$item_index]}"
+    if [[ "$selected_line" =~ ^.*(\-\-\-|===+).*$ ]]; then
+       return 1
+    fi
+  fi
+  
+
+  option=${sorted_options[$((index - 1))]}
+  IFS='|' read -r _ description function_name <<< "$option"
+  selected_functions[$function_name]=1
+  [[ "$function_name" == "FASTFETCH" ]] && selected_functions[MOTD]=0
+done
+
+
+
+
+  
+  clear
   show_proxmenux_logo
   msg_title "$SCRIPT_TITLE"
 
-    for index in "${selected_options[@]}"; do
+  for option in "${sorted_options[@]}"; do
-      option=${sorted_options[$((index - 1))]}
+    IFS='|' read -r _ description function_name <<< "$option"
-      IFS='|' read -r category description function_name <<< "$option"
-      selected_functions[$function_name]=1
-
-
-      [[ "$function_name" == "FASTFETCH" ]] && selected_functions[MOTD]=0
-    done
-
-    for index in "${!sorted_options[@]}"; do
-      option=${sorted_options[$index]}
-      IFS='|' read -r category description function_name <<< "$option"
     if [[ ${selected_functions[$function_name]} -eq 1 ]]; then
       case $function_name in
         APTUPGRADE) apt_upgrade ;;
@@ -2761,19 +2790,13 @@ main_menu() {
     fi
   done
 
-
+  if [[ "$NECESSARY_REBOOT" -eq 1 ]]; then
-
+    whiptail --title "Reboot Required" \
-
+           --yesno "$(translate "Some changes require a reboot to take effect. Do you want to restart now?")" 10 60
-
+    if [[ $? -eq 0 ]]; then
-
-
-  if [ "$NECESSARY_REBOOT" -eq 1 ]; then
-    whiptail --title "Reboot Required" --yesno "$(translate "Some changes require a reboot to take effect. Do you want to restart now?")" 10 60
-    if [ $? -eq 0 ]; then
-
       msg_info "$(translate "Removing no longer required packages and purging old cached updates...")"
-        /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' autoremove >/dev/null 2>&1
+      apt-get -y autoremove >/dev/null 2>&1
-        /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' autoclean >/dev/null 2>&1
+      apt-get -y autoclean >/dev/null 2>&1
       msg_ok "$(translate "Cleanup finished")"
       msg_success "$(translate "Press Enter to continue...")"
       read -r
@@ -2781,32 +2804,24 @@ main_menu() {
       reboot
     else
       msg_info "$(translate "Removing no longer required packages and purging old cached updates...")"
-        /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' autoremove >/dev/null 2>&1
+      apt-get -y autoremove >/dev/null 2>&1
-        /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' autoclean >/dev/null 2>&1
+      apt-get -y autoclean >/dev/null 2>&1
       msg_ok "$(translate "Cleanup finished")"
       msg_info2 "$(translate "You can reboot later manually.")"
       msg_success "$(translate "Press Enter to continue...")"
       read -r
       exit 0
     fi
-
   fi
+
   msg_success "$(translate "All changes applied. No reboot required.")"
   msg_success "$(translate "Press Enter to return to menu...")"
   read -r
-
+  clear
-else
-        exit 0
-fi
-
 }
 
 
 
 
-if [[ "$LANGUAGE" != "en" ]]; then
-    show_proxmenux_logo
-    msg_lang "$(translate "Generating automatic translations...")"
-fi
 main_menu
 

scripts/menus/menu_post_install.sh

@@ -6,11 +6,10 @@
 # Author      : MacRimi
 # Copyright   : (c) 2024 MacRimi
 # License     : MIT (https://raw.githubusercontent.com/MacRimi/ProxMenux/main/LICENSE)
-# Version     : 1.0
+# Version     : 1.1
-# Last Updated: 24/02/2025
+# Last Updated: 28/05/2025
 # ==========================================================
 
-# Configuration ============================================
 REPO_URL="https://raw.githubusercontent.com/MacRimi/ProxMenux/main"
 BASE_DIR="/usr/local/share/proxmenux"
 UTILS_FILE="$BASE_DIR/utils.sh"
@@ -19,21 +18,24 @@ VENV_PATH="/opt/googletrans-env"
 if [[ -f "$UTILS_FILE" ]]; then
     source "$UTILS_FILE"
 fi
+
 load_language
 initialize_cache
-#show_proxmenux_logo
-# ==========================================================
 
+# ==========================================================
 
 confirm_and_run() {
     local name="$1"
     local command="$2"
 
-    if whiptail --title "$(translate "Confirmation")" \
+    dialog --clear --title "$(translate "Confirmation")" \
-                --yesno "$(translate "Do you want to run the post-installation script from") $name?" \
+           --yesno "\n\n$(translate "Do you want to run the post-installation script from") $name?" 10 70
-                10 70; then
+    response=$?
+    clear
+
+    if [ $response -eq 0 ]; then
         eval "$command"
-        echo ""
+        echo
         msg_success "$(translate 'Press ENTER to continue...')"
         read -r _
     else
@@ -42,62 +44,75 @@ confirm_and_run() {
     fi
 }
 
+scripts_es=(
+    "Script post-install personalizable |ProxMenux|bash <(curl -s $REPO_URL/scripts/customizable_post_install.sh)"
+    "Script post-install Proxmox VE |Helper-Scripts|bash -c \"\$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/pve/post-pve-install.sh); msg_success \\\"\$(translate 'Press ENTER to continue...')\\\"; read -r _\""
+    "Script post-iinstall xshok-proxmox|fork xshok-proxmox|confirm_and_run \"Xshok\" \"wget https://raw.githubusercontent.com/MacRimi/xshok-proxmox/master/install-post.sh -c -O install-post.sh && bash install-post.sh && rm install-post.sh\""
+    "Desinstalar herramientas|ProxMenux|bash <(curl -s $REPO_URL/scripts/uninstall-tools.sh)"
+)
 
-
+scripts_all_langs=(
-# Define scripts array
-scripts=(
     "Customizable script post-installation|ProxMenux|bash <(curl -s $REPO_URL/scripts/customizable_post_install.sh)"
     "Proxmox VE Post Install|Helper-Scripts|bash -c \"\$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/pve/post-pve-install.sh); msg_success \\\"\$(translate 'Press ENTER to continue...')\\\"; read -r _\""
-    "xshok-proxmox Post install|fork xshok-proxmox|confirm_and_run \"Xshok\" \"wget https://raw.githubusercontent.com/MacRimi/xshok-proxmox/master/install-post.sh -c -O install-post.sh && bash install-post.sh && rm install-post.sh\""
+    "Xshok-proxmox Post install|fork xshok-proxmox|confirm_and_run \"Xshok\" \"wget https://raw.githubusercontent.com/MacRimi/xshok-proxmox/master/install-post.sh -c -O install-post.sh && bash install-post.sh && rm install-post.sh\""
     "Uninstall Tools|ProxMenux|bash <(curl -s $REPO_URL/scripts/uninstall-tools.sh)"
-
 )
 
 show_menu() {
     while true; do
-        HEADER=$(printf "  %-52s %-20s" "$(translate "Name")" "$(translate "Repository")")
+        local HEADER
+        local current_scripts=()
+
+        if [[ "$LANGUAGE" == "es" ]]; then
+            HEADER="\n Seleccione un script post-instalación:\n\n    Descripción                                     │ Fuente"
+            current_scripts=("${scripts_es[@]}")
+        else
+            HEADER="\n$(translate " Select a post-installation script:")\n\n    Description                                     │ Source"
+            current_scripts=("${scripts_all_langs[@]}")
+        fi
 
         menu_items=()
-        for i in "${!scripts[@]}"; do
+
-            IFS='|' read -r name repository command <<< "${scripts[$i]}"
+        for i in "${!current_scripts[@]}"; do
+            IFS='|' read -r name repository command <<< "${current_scripts[$i]}"
             number=$((i+1))
-            padded_option=$(printf "%2d %-50s" "$number" "$(translate "$name")")
+            local display_name="$name"
-            menu_items+=("$padded_option" "$repository")
+            [[ "$LANGUAGE" != "es" ]] && display_name="$(translate "$name")"
+            formatted_line=$(printf "%-47s │ %s" "$display_name" "$repository")
+            menu_items+=("$number" "$formatted_line")
         done
 
-        menu_items+=("$(printf "%2d %-40s" "$((${#scripts[@]}+1))" "$(translate "Return to Main Menu")")" "")
+        menu_items+=("$(( ${#current_scripts[@]}+1 ))" "$(translate "Return to Main Menu")")
 
-        cleanup
+        exec 3>&1
+        script_selection=$(dialog --clear --backtitle "ProxMenux" --title "$(translate "Post-Installation Scripts Menu")" \
+                            --menu "$HEADER" 20 78 $((${#menu_items[@]}/2)) \
+                            "${menu_items[@]}" 2>&1 1>&3)
+        exit_status=$?
+        exec 3>&-
 
-        script_selection=$(whiptail --title "$(translate "Post-Installation Scripts Menu")" \
+        clear
-                                    --menu "\n$HEADER" 20 78 $((${#scripts[@]}+1)) \
-                                    "${menu_items[@]}" 3>&1 1>&2 2>&3)
 
-        if [ -n "$script_selection" ]; then
+        if [ $exit_status -ne 0 ]; then
-            selected_number=$(echo "$script_selection" | awk '{print $1}')
-            
-            if [ "$selected_number" = "$((${#scripts[@]}+1))" ]; then
-                #show_proxmenux_logo
             exec bash <(curl -s "$REPO_URL/scripts/menus/main_menu.sh")
         fi
 
-            index=$((selected_number - 1))
+        if [ "$script_selection" = "$(( ${#current_scripts[@]} + 1 ))" ]; then
-            if [ $index -ge 0 ] && [ $index -lt ${#scripts[@]} ]; then
+            exec bash <(curl -s "$REPO_URL/scripts/menus/main_menu.sh")
-                IFS='|' read -r name repository command <<< "${scripts[$index]}"
+        fi
+
+        index=$((script_selection - 1))
+        if [ $index -ge 0 ] && [ $index -lt ${#current_scripts[@]} ]; then
+            IFS='|' read -r _ _ command <<< "${current_scripts[$index]}"
             eval "$command"
         fi
-
-        else
-            #show_proxmenux_logo
-            exec bash <(curl -s "$REPO_URL/scripts/menus/main_menu.sh")
-        fi
     done
 }
 
-clear
-if [[ "$LANGUAGE" != "en" ]]; then
-    show_proxmenux_logo
-    msg_lang "$(translate "Generating automatic translations...")"
-fi
 
+#if [[ "$LANGUAGE" != "en" ]]; then
+#    show_proxmenux_logo
+#    msg_lang "$(translate "Generating automatic translations...")"
+#fi
+cleanup
 show_menu

web/components/DocSidebar.tsx

@@ -81,7 +81,6 @@ export const sidebarItems: MenuItem[] = [
   {
     title: "Network",
     submenu: [
-      { title: "Repair Network", href: "/docs/network/repair-network" },
       { title: "Verify Network", href: "/docs/network/verify-network" },
       { title: "Show IP Information", href: "/docs/network/show-ip-information" },
     ],