Fix: FS-Trim Cancel / Error-Button (#1965)

misc/fstrim.sh

@@ -2,8 +2,9 @@
 
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
-# License: MIT
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+
+set -o pipefail
 
 function header_info() {
   clear
@@ -16,11 +17,13 @@ function header_info() {
                     /____/
 EOF
 }
+
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
 CM='\xE2\x9C\x94\033'
 GN=$(echo "\033[1;92m")
 CL=$(echo "\033[m")
+
 header_info
 echo "Loading..."
 
@@ -29,50 +32,66 @@ if [ "$ROOT_FS" != "ext4" ]; then
     echo "Root filesystem is not ext4. Exiting script."
     exit 1
 fi
+whiptail --backtitle "Proxmox VE Helper Scripts" \
+         --title "Proxmox VE LXC Filesystem Trim" \
+         --yesno "The LXC containers will undergo the fstrim command. Proceed?" 10 58 || exit
 
-whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE LXC Filesystem Trim" --yesno "The LXC containers will undergo the fstrim command. Proceed?" 10 58 || exit
 NODE=$(hostname)
 EXCLUDE_MENU=()
 MSG_MAX_LENGTH=0
+
 while read -r TAG ITEM; do
   OFFSET=2
   ((${#ITEM} + OFFSET > MSG_MAX_LENGTH)) && MSG_MAX_LENGTH=${#ITEM}+OFFSET
   EXCLUDE_MENU+=("$TAG" "$ITEM " "OFF")
 done < <(pct list | awk 'NR>1')
-excluded_containers=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Containers on $NODE" --checklist "\nSelect containers to skip from trimming:\n" \
+
-  16 $((MSG_MAX_LENGTH + 23)) 6 "${EXCLUDE_MENU[@]}" 3>&1 1>&2 2>&3 | tr -d '"') || exit  
+excluded_containers_raw=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
+    --title "Containers on $NODE" \
+    --checklist "\nSelect containers to skip from trimming:\n" \
+    16 $((MSG_MAX_LENGTH + 23)) 6 "${EXCLUDE_MENU[@]}" 3>&1 1>&2 2>&3)
+
+if [ $? -ne 0 ]; then
+    exit
+fi
+
+excluded_containers=$(echo "$excluded_containers_raw" | tr -d '"')
 
 function trim_container() {
   local container=$1
   header_info
   echo -e "${BL}[Info]${GN} Trimming ${BL}$container${CL} \n"
-  local before_trim=$(lvs | awk -F '[[:space:]]+' 'NR>1 && (/Data%|'"vm-$container"'/) {gsub(/%/, "", $7); print $7}')
+  
+  local before_trim
+  before_trim=$(lvs | awk -F '[[:space:]]+' 'NR>1 && (/Data%|'"vm-$container"'/) {gsub(/%/, "", $7); print $7}')
   echo -e "${RD}Data before trim $before_trim%${CL}"
-  pct fstrim $container
+  
-  local after_trim=$(lvs | awk -F '[[:space:]]+' 'NR>1 && (/Data%|'"vm-$container"'/) {gsub(/%/, "", $7); print $7}')
+  pct fstrim "$container"
+  
+  local after_trim
+  after_trim=$(lvs | awk -F '[[:space:]]+' 'NR>1 && (/Data%|'"vm-$container"'/) {gsub(/%/, "", $7); print $7}')
   echo -e "${GN}Data after trim $after_trim%${CL}"
+  
   sleep 1.5
 }
 
-
-
 for container in $(pct list | awk '{if(NR>1) print $1}'); do
-  if [[ " ${excluded_containers[@]} " =~ " $container " ]]; then
+  if [[ " ${excluded_containers} " =~ " $container " ]]; then
     header_info
     echo -e "${BL}[Info]${GN} Skipping ${BL}$container${CL}"
     sleep 1
   else
-    template=$(pct config $container | grep -q "template:" && echo "true" || echo "false")
+    template=$(pct config "$container" | grep -q "template:" && echo "true" || echo "false")
     if [ "$template" == "true" ]; then
       header_info
       echo -e "${BL}[Info]${GN} Skipping ${container} ${RD}$container is a template ${CL} \n"
       sleep 1
       continue
     fi
-      trim_container $container
+    trim_container "$container"
   fi
 done
 
 wait
 header_info
-echo -e "${GN} Finished, LXC Containers Trimmed. ${CL} \n"
+echo -e "${GN}Finished, LXC Containers Trimmed.${CL} \n"