From ba7247efa9ce99aac67e4f963341e88f3b3dfefe Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 23 Feb 2021 09:58:43 +0100
Subject: [PATCH] Update and rename 92-mounts to 92-smb_mounts_v1.1

---
 .../cont-init.d/{92-mounts => 92-smb_mounts_v1.1} | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 rename ubooquity/rootfs/etc/cont-init.d/{92-mounts => 92-smb_mounts_v1.1} (61%)

diff --git a/ubooquity/rootfs/etc/cont-init.d/92-mounts b/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
similarity index 61%
rename from ubooquity/rootfs/etc/cont-init.d/92-mounts
rename to ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
index 2a0f70aeb..30c677477 100644
--- a/ubooquity/rootfs/etc/cont-init.d/92-mounts
+++ b/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-#########################
-# MOUNT SMB SHARES v1.1 #
-#########################
+####################
+# MOUNT SMB SHARES #
+####################
 if bashio::config.has_value 'networkdisks'; then
     # Mount CIFS Share if configured and if Protection Mode is active
     bashio::log.info 'Mounting smb share(s)...'
@@ -23,12 +23,11 @@ if bashio::config.has_value 'networkdisks'; then
     for disk in ${MOREDISKS//,/ }  # Separate comma separated values
     do
       disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-      diskname=${disk##*/} # Get only last part of the name
-      rm -r /mnt/$diskname 2>/dev/null || true # Create dir
+      diskname=${disk//\\//} #replace \ with /
+      diskname=${diskname##*/} # Get only last part of the name
       mkdir -p /mnt/$diskname  # Create dir
       chown -R root:root /mnt/$diskname  # Permissions
-      mount -t cifs -o username=$CIFS_USERNAME,password=${CIFS_PASSWORD}${SMBVERS} $disk /mnt/$diskname \
-      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname" \
-      || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" 
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
     done || true
 fi