From 61976e8c13670c08dc18f7e2463c2083719ec04c Mon Sep 17 00:00:00 2001
From: MacRimi <123239993+MacRimi@users.noreply.github.com>
Date: Sun, 15 Jun 2025 11:47:28 +0200
Subject: [PATCH] Update mount_disk_host_bk.sh

---
 scripts/backup_restore/mount_disk_host_bk.sh | 32 ++++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/scripts/backup_restore/mount_disk_host_bk.sh b/scripts/backup_restore/mount_disk_host_bk.sh
index 9b69b6c..2960bce 100644
--- a/scripts/backup_restore/mount_disk_host_bk.sh
+++ b/scripts/backup_restore/mount_disk_host_bk.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ==========================================================
-# ProxMenu - Mount independent disk on Proxmox host
+# ProxMenu - Mount disk on Proxmox host for backups
 # ==========================================================
 # Author      : MacRimi
 # Copyright   : (c) 2024 MacRimi
@@ -155,7 +155,6 @@ is_system_disk() {
     return 1 
 }
 
-msg_info "$(translate "Detecting available disks...")"
 
 USED_DISKS=$(lsblk -n -o PKNAME,TYPE | grep 'lvm' | awk '{print "/dev/" $1}')
 MOUNTED_DISKS=$(lsblk -ln -o NAME,MOUNTPOINT | awk '$2!="" {print "/dev/" $1}')
@@ -285,11 +284,10 @@ done < <(lsblk -dn -e 7,11 -o PATH)
 
 if [ "${#FREE_DISKS[@]}" -eq 0 ]; then
     dialog --title "$(translate "Error")" --msgbox "$(translate "No available disks found on the host.")" 8 60
-    clear
+    
     exit 1
 fi
 
-msg_ok "$(translate "Available disks detected.")"
 
 # Building the array for dialog (format: tag item on/off tag item on/off...)
 DLG_LIST=()
@@ -303,11 +301,10 @@ SELECTED=$(dialog --clear --backtitle "ProxMenux" --title "$(translate "Select D
 
 if [ -z "$SELECTED" ]; then
     dialog --title "$(translate "Error")" --msgbox "$(translate "No disk was selected.")" 8 50
-    clear
+    
     exit 1
 fi
 
-msg_ok "$(translate "Disk selected successfully:") $SELECTED"
 
 # ------------------- Partitions and formatting ------------------------
 
@@ -320,7 +317,7 @@ if [ -n "$PARTITION" ]; then
     CURRENT_FS=$(lsblk -no FSTYPE "$PARTITION" | xargs)
     if [[ "$CURRENT_FS" == "ext4" || "$CURRENT_FS" == "xfs" || "$CURRENT_FS" == "btrfs" ]]; then
         SKIP_FORMAT=true
-        msg_ok "$(translate "Detected existing filesystem") $CURRENT_FS $(translate "on") $PARTITION."
+      
     else
         dialog --title "$(translate "Unsupported Filesystem")" --yesno \
         "$(translate "The partition") $PARTITION $(translate "has an unsupported filesystem ($CURRENT_FS).\nDo you want to format it?")" 10 70
@@ -331,7 +328,7 @@ else
     if [[ "$CURRENT_FS" == "ext4" || "$CURRENT_FS" == "xfs" || "$CURRENT_FS" == "btrfs" ]]; then
         SKIP_FORMAT=true
         PARTITION="$SELECTED"
-        msg_ok "$(translate "Detected filesystem") $CURRENT_FS $(translate "directly on disk") $SELECTED."
+
     else
         dialog --title "$(translate "No Valid Partitions")" --yesno \
         "$(translate "The disk has no partitions and no valid filesystem. Do you want to create a new partition and format it?")" 10 70
@@ -384,20 +381,18 @@ if [ "$SKIP_FORMAT" != true ]; then
         "$(translate "Failed to format partition") $PARTITION $(translate "with") $FORMAT_TYPE." 12 70
         exit 1
     else
-        msg_ok "$(translate "Partition") $PARTITION $(translate "successfully formatted with") $FORMAT_TYPE."
+  
         partprobe "$SELECTED"
         sleep 2
     fi
 fi
 
+
 # ------------------- Mount point and permissions (modular, non-blocking) -------------------
 
-mount_disk_host_bk_worker() {
-    local DEFAULT_MOUNT="/mnt/backup"
-    local MOUNT_POINT
 
-
-    MOUNT_POINT=$(dialog --title "$(translate "Mount Point")" \
+    # Pedir al usuario (puedes añadir translate aquí si quieres)
+    MOUNT_POINT=$(dialog --clear --title "$(translate "Mount Point")" \
         --inputbox "$(translate "Enter the mount point for the disk (e.g., /mnt/backup):")" \
         10 60 "$DEFAULT_MOUNT" 2>&1 >/dev/tty)
 
@@ -423,19 +418,16 @@ mount_disk_host_bk_worker() {
         if ! getent group sharedfiles >/dev/null; then
             groupadd sharedfiles
         fi
+
         chown root:sharedfiles "$MOUNT_POINT"
         chmod 2775 "$MOUNT_POINT"
         echo "$MOUNT_POINT" > /usr/local/share/proxmenux/last_backup_mount.txt
-
+        # ¡IMPORTANTE! Devolver SOLO el path si todo ha ido bien
+        MOUNT_POINT=$(echo "$MOUNT_POINT" | head -n1 | tr -d '\r\n\t ')
         echo "$MOUNT_POINT"
-        return 0
     else
         >&2 echo "$(translate "Failed to mount the disk at") $MOUNT_POINT"
         return 1
     fi
-}
-
-
 
 }
-