From 578f077d3bbb1b018df7a75712994c594630c032 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Sat, 23 Oct 2021 16:14:48 +0200
Subject: [PATCH] external smb code

---
 cloudcommander/rootfs/92-smb_mounts.sh |  86 +++++++++++
 cloudcommander/rootfs/run.sh           | 191 ++++++++-----------------
 photoprism/rootfs/92-smb_mounts.sh     |  86 +++++++++++
 photoprism/rootfs/run.sh               | 117 +++------------
 4 files changed, 246 insertions(+), 234 deletions(-)
 create mode 100644 cloudcommander/rootfs/92-smb_mounts.sh
 create mode 100644 photoprism/rootfs/92-smb_mounts.sh

diff --git a/cloudcommander/rootfs/92-smb_mounts.sh b/cloudcommander/rootfs/92-smb_mounts.sh
new file mode 100644
index 000000000..eccb42d4e
--- /dev/null
+++ b/cloudcommander/rootfs/92-smb_mounts.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/with-contenv bashio
+
+#########################
+# MOUNT SMB SHARES v1.6 #
+#########################
+if bashio::config.has_value 'networkdisks'; then
+
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
+
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+
+    # Data validation
+    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
+      bashio::log.fatal "The structure of your <networkdisks> doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
+      exit 1
+    fi
+
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+        done
+      done
+    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
+      # 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  || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
+fi
diff --git a/cloudcommander/rootfs/run.sh b/cloudcommander/rootfs/run.sh
index 85d7b687d..aa6184dc5 100644
--- a/cloudcommander/rootfs/run.sh
+++ b/cloudcommander/rootfs/run.sh
@@ -5,38 +5,38 @@
 ##########
 
 if bashio::supervisor.ping; then
-    bashio::log.blue \
-        '-----------------------------------------------------------'
-    bashio::log.blue " Add-on: $(bashio::addon.name)"
-    bashio::log.blue " $(bashio::addon.description)"
-    bashio::log.blue \
-        '-----------------------------------------------------------'
+  bashio::log.blue \
+  '-----------------------------------------------------------'
+  bashio::log.blue " Add-on: $(bashio::addon.name)"
+  bashio::log.blue " $(bashio::addon.description)"
+  bashio::log.blue \
+  '-----------------------------------------------------------'
 
-    bashio::log.blue " Add-on version: $(bashio::addon.version)"
-    if bashio::var.true "$(bashio::addon.update_available)"; then
-        bashio::log.magenta ' There is an update available for this add-on!'
-        bashio::log.magenta \
-            " Latest add-on version: $(bashio::addon.version_latest)"
-        bashio::log.magenta ' Please consider upgrading as soon as possible.'
-    else
-        bashio::log.green ' You are running the latest version of this add-on.'
-    fi
+  bashio::log.blue " Add-on version: $(bashio::addon.version)"
+  if bashio::var.true "$(bashio::addon.update_available)"; then
+    bashio::log.magenta ' There is an update available for this add-on!'
+    bashio::log.magenta \
+    " Latest add-on version: $(bashio::addon.version_latest)"
+    bashio::log.magenta ' Please consider upgrading as soon as possible.'
+  else
+    bashio::log.green ' You are running the latest version of this add-on.'
+  fi
 
-    bashio::log.blue " System: $(bashio::info.operating_system)" \
-        " ($(bashio::info.arch) / $(bashio::info.machine))"
-    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
-    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+  bashio::log.blue " System: $(bashio::info.operating_system)" \
+  " ($(bashio::info.arch) / $(bashio::info.machine))"
+  bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+  bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
 
-    bashio::log.blue \
-        '-----------------------------------------------------------'
-    bashio::log.blue \
-        ' Please, share the above information when looking for help'
-    bashio::log.blue \
-        ' or support in, e.g., GitHub, forums or the Discord chat.'
-    bashio::log.green \
-        ' https://github.com/alexbelgium/hassio-addons'
-    bashio::log.blue \
-        '-----------------------------------------------------------'
+  bashio::log.blue \
+  '-----------------------------------------------------------'
+  bashio::log.blue \
+  ' Please, share the above information when looking for help'
+  bashio::log.blue \
+  ' or support in, e.g., GitHub, forums or the Discord chat.'
+  bashio::log.green \
+  ' https://github.com/alexbelgium/hassio-addons'
+  bashio::log.blue \
+  '-----------------------------------------------------------'
 fi
 
 ######################
@@ -45,111 +45,31 @@ fi
 
 # Mount local Share if configured and if Protection Mode is active
 if bashio::config.has_value 'localdisks'; then
-    bashio::log.info 'Mounting local hdd...'
-    #bashio::require.unprotected
-    MOREDISKS=$(bashio::config 'localdisks')
-    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
-    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
-    do
-        bashio::log.info "Mount ${disk}"
-        mkdir -p /share/$disk && \
-            if [ ! -d /share/$disk ]; then
-              echo "Creating /share/$disk"
-              mkdir -p /share/$disk
-              chown -R abc:abc /share/$disk
-            fi
-            mount /dev/$disk /mnt && \
-            bashio::log.info "Success! Mounted to /nmt/$disk"   
-    done || \
-    bashio::log.warning "Error, /dev/$disk couldn't be mounted. Is priviledged mode on?"
+  bashio::log.info 'Mounting local hdd...'
+  #bashio::require.unprotected
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+    bashio::log.info "Mount ${disk}"
+    mkdir -p /share/$disk && \
+    if [ ! -d /share/$disk ]; then
+      echo "Creating /share/$disk"
+      mkdir -p /share/$disk
+      chown -R abc:abc /share/$disk
+    fi
+    mount /dev/$disk /mnt && \
+    bashio::log.info "Success! Mounted to /nmt/$disk"
+  done || \
+  bashio::log.warning "Error, /dev/$disk couldn't be mounted. Is priviledged mode on?"
 fi || true
 
-#########################
-# MOUNT SMB SHARES v1.6 #
-#########################
-if bashio::config.has_value 'networkdisks'; then
-
-  # Define variables
-  MOREDISKS=$(bashio::config 'networkdisks')
-  CIFS_USERNAME=$(bashio::config 'cifsusername')
-  CIFS_PASSWORD=$(bashio::config 'cifspassword')
-  MOUNTED=false
-  SMBVERS=""
-  SECVERS=""
-
-  # Dont execute if still default
-  [ ${MOREDISKS::1} == "<" ] && exit 0
-
-  # Mount CIFS Share if configured and if Protection Mode is active
-  bashio::log.info 'Mounting smb share(s)...'
-
-  if bashio::config.has_value 'cifsdomain'; then
-    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
-  else
-    DOMAIN=""
-  fi
-
-  # Mounting disks
-  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
-
-    # Clean name of network share
-    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-    diskname=${disk//\\//}            #replace \ with /
-    diskname=${diskname##*/}          # Get only last part of the name
-
-    # Data validation
-    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
-      bashio::log.fatal "The structure of your <networkdisks> doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
-      exit 1
-    fi
-
-    # Prepare mount point
-    mkdir -p /mnt/$diskname
-    chown -R root:root /mnt/$diskname
-
-    #Tries to mount with default options
-    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
-
-    # if Fail test different smb and sec versions
-    if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
-        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
-        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
-          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
-        done
-      done
-    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
-      # 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  || true 
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
-
-      # Error code
-      bashio::log.fatal "Error read : $(<ERRORCODE)"
-      rm ERRORCODE
-
-      # clean folder
-      umount /mnt/$diskname 2>/dev/null || true
-      rmdir /mnt/$diskname || true
-    fi
-
-  done
-fi
-
-
+######################
+# EXECUTE SMB SCRIPT #
+######################
+chown $(id -u):$(id -g) /92-smb_mounts.sh
+chmod a+x /92-smb_mounts.sh
+sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
+/./92-smb_mounts.sh
 
 #################
 # NGINX SETTING #
@@ -166,7 +86,7 @@ export CLOUDCMD_PREFIX
 
 declare ADDON_PROTOCOL=http
 if bashio::config.true 'ssl'; then
-ADDON_PROTOCOL=https
+  ADDON_PROTOCOL=https
 fi
 
 port=$(bashio::addon.port 80)
@@ -196,6 +116,7 @@ fi
 
 bashio::log.info "Starting..."
 
-./usr/src/app/bin/cloudcmd.mjs '"'$DROPBOX_TOKEN$CUSTOMOPTIONS'"' & bashio::net.wait_for 8000 localhost 900 || true
-bashio::log.info "Started !" 
+./usr/src/app/bin/cloudcmd.mjs '"'$DROPBOX_TOKEN$CUSTOMOPTIONS'"' &
+bashio::net.wait_for 8000 localhost 900 || true
+bashio::log.info "Started !"
 exec nginx
diff --git a/photoprism/rootfs/92-smb_mounts.sh b/photoprism/rootfs/92-smb_mounts.sh
new file mode 100644
index 000000000..eccb42d4e
--- /dev/null
+++ b/photoprism/rootfs/92-smb_mounts.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/with-contenv bashio
+
+#########################
+# MOUNT SMB SHARES v1.6 #
+#########################
+if bashio::config.has_value 'networkdisks'; then
+
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
+
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+
+    # Data validation
+    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
+      bashio::log.fatal "The structure of your <networkdisks> doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
+      exit 1
+    fi
+
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+        done
+      done
+    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
+      # 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  || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
+fi
diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh
index ba6459344..b4ecdf6e4 100644
--- a/photoprism/rootfs/run.sh
+++ b/photoprism/rootfs/run.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bashio
 
-bashio::log.warning "Warning - minimum configuration recommended : 2 cpu cores and 4 GB of memory" 
+bashio::log.warning "Warning - minimum configuration recommended : 2 cpu cores and 4 GB of memory"
 
 ##########
 # BANNER #
@@ -65,92 +65,13 @@ if bashio::config.has_value 'localdisks'; then
   bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
 fi || true
 
-#########################
-# MOUNT SMB SHARES v1.6 #
-#########################
-if bashio::config.has_value 'networkdisks'; then
-
-  # Define variables
-  MOREDISKS=$(bashio::config 'networkdisks')
-  CIFS_USERNAME=$(bashio::config 'cifsusername')
-  CIFS_PASSWORD=$(bashio::config 'cifspassword')
-  MOUNTED=false
-  SMBVERS=""
-  SECVERS=""
-
-  # Dont execute if still default
-  [ ${MOREDISKS::1} == "<" ] && exit 0
-
-  # Mount CIFS Share if configured and if Protection Mode is active
-  bashio::log.info 'Mounting smb share(s)...'
-
-  if bashio::config.has_value 'cifsdomain'; then
-    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
-  else
-    DOMAIN=""
-  fi
-
-  # Mounting disks
-  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
-
-    # Clean name of network share
-    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-    diskname=${disk//\\//}            #replace \ with /
-    diskname=${diskname##*/}          # Get only last part of the name
-
-    # Data validation
-    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
-      bashio::log.fatal "The structure of your <networkdisks> doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
-      exit 1
-    fi
-
-    # Prepare mount point
-    mkdir -p /mnt/$diskname
-    chown -R root:root /mnt/$diskname
-
-    #Tries to mount with default options
-    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
-
-    # if Fail test different smb and sec versions
-    if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
-        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
-        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
-          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
-        done
-      done
-    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
-      # 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  || true 
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
-
-      # Error code
-      bashio::log.fatal "Error read : $(<ERRORCODE)"
-      rm ERRORCODE
-
-      # clean folder
-      umount /mnt/$diskname 2>/dev/null || true
-      rmdir /mnt/$diskname || true
-    fi
-
-  done
-fi
-
-
+######################
+# EXECUTE SMB SCRIPT #
+######################
+chown $(id -u):$(id -g) /92-smb_mounts.sh
+chmod a+x /92-smb_mounts.sh
+sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
+/./92-smb_mounts.sh
 
 ##############
 # LAUNCH APP #
@@ -170,18 +91,16 @@ else
 fi
 
 # Test configs
-for variabletest in $PHOTOPRISM_STORAGE_PATH $PHOTOPRISM_ORIGINALS_PATH $PHOTOPRISM_IMPORT_PATH $PHOTOPRISM_BACKUP_PATH
-do
-# Check if path exists
-if bashio::fs.directory_exists $variabletest
-then
-true
-else 
-bashio::log.info "Path $variabletest doesn't exist. Creating it now..." 
-mkdir -p $variabletest || bashio::log.fatal "Can't create $variabletest path"
-fi
-# Check if path writable
-touch $variabletest/aze && rm $variabletest/aze || bashio::log.fatal "$variable path is not writable"
+for variabletest in $PHOTOPRISM_STORAGE_PATH $PHOTOPRISM_ORIGINALS_PATH $PHOTOPRISM_IMPORT_PATH $PHOTOPRISM_BACKUP_PATH; do
+  # Check if path exists
+  if bashio::fs.directory_exists $variabletest; then
+    true
+  else
+    bashio::log.info "Path $variabletest doesn't exist. Creating it now..."
+    mkdir -p $variabletest || bashio::log.fatal "Can't create $variabletest path"
+  fi
+  # Check if path writable
+  touch $variabletest/aze && rm $variabletest/aze || bashio::log.fatal "$variable path is not writable"
 done
 
 # Start messages