From 23c741ec66122bcb4e61809593f1235b5e96f401 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 23 Oct 2021 10:54:49 +0200
Subject: [PATCH] Update 92-smb_mounts_v1.4.sh

---
 .../etc/cont-init.d/92-smb_mounts_v1.4.sh     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh b/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
index 6466c4170..46c7bb7f0 100644
--- a/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -48,25 +48,27 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      bashio::log.fatal "Error, could not mount disk. Here is some debugging info :"
-      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
-      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
-    fi
-
     # Messages
     if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
       touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
       && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
       || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
       bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
       # clean folder
       umount /mnt/$diskname 2>/dev/null || true
       rmdir /mnt/$diskname || true