From e4e4aef778597521fb8e1a29451c3b7a154b1251 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Sat, 23 Oct 2021 20:06:20 +0200
Subject: [PATCH] align local mount code

---
 .../root/etc/cont-init.d/92-local_mounts.sh   | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.1.sh   | 26 -----------
 bazarr/root/etc/cont-init.d/92-smb_mounts.sh  | 16 +++----
 cloudcommander/rootfs/92-local_mounts.sh      | 26 +++++++++++
 cloudcommander/rootfs/run.sh                  | 44 ++++++-------------
 emby/root/etc/cont-init.d/92-local_mounts.sh  | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.2.sh   | 27 ------------
 filebrowser/rootfs/92-local_mounts.sh         | 26 +++++++++++
 filebrowser/rootfs/run.sh                     | 44 ++++++-------------
 .../root/etc/cont-init.d/92-local_mounts.sh   | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.1.sh   | 26 -----------
 photoprism/rootfs/92-local_mounts.sh          | 26 +++++++++++
 photoprism/rootfs/run.sh                      | 44 ++++++-------------
 plex/root/etc/cont-init.d/92-local_mounts.sh  | 27 ++++++++++++
 .../root/etc/cont-init.d/92-local_mounts_v1.0 | 26 -----------
 .../rootfs/etc/cont-init.d/92-local_mounts.sh | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.2.sh   | 26 -----------
 .../root/etc/cont-init.d/92-local_mounts.sh   | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.1.sh   | 26 -----------
 .../root/etc/cont-init.d/92-local_mounts.sh   | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.1.sh   | 26 -----------
 .../root/etc/cont-init.d/92-local_mounts.sh   | 27 ++++++++++++
 .../etc/cont-init.d/92-local_mounts_v1.1.sh   | 26 -----------
 23 files changed, 341 insertions(+), 310 deletions(-)
 create mode 100644 bazarr/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
 create mode 100644 cloudcommander/rootfs/92-local_mounts.sh
 create mode 100644 emby/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 emby/root/etc/cont-init.d/92-local_mounts_v1.2.sh
 create mode 100644 filebrowser/rootfs/92-local_mounts.sh
 create mode 100644 lidarr/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 lidarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
 create mode 100644 photoprism/rootfs/92-local_mounts.sh
 create mode 100644 plex/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 plex/root/etc/cont-init.d/92-local_mounts_v1.0
 create mode 100644 qbittorrent/rootfs/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 qbittorrent/rootfs/etc/cont-init.d/92-local_mounts_v1.2.sh
 create mode 100644 radarr/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 radarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
 create mode 100644 readarr/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 readarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
 create mode 100644 sonarr/root/etc/cont-init.d/92-local_mounts.sh
 delete mode 100644 sonarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh

diff --git a/bazarr/root/etc/cont-init.d/92-local_mounts.sh b/bazarr/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/bazarr/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
deleted file mode 100644
index bdefdc56b..000000000
--- a/bazarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/bazarr/root/etc/cont-init.d/92-smb_mounts.sh b/bazarr/root/etc/cont-init.d/92-smb_mounts.sh
index 7f766dbc1..3af6a1539 100644
--- a/bazarr/root/etc/cont-init.d/92-smb_mounts.sh
+++ b/bazarr/root/etc/cont-init.d/92-smb_mounts.sh
@@ -39,11 +39,6 @@ if bashio::config.has_value 'networkdisks'; then
       exit 1
     fi
 
-    # Test if ip is available
-    if [ ping 127.0.0.1 -c 1 &>/dev/null ]; then
-
-    fi
-
     # Prepare mount point
     mkdir -p /mnt/$diskname
     chown -R root:root /mnt/$diskname
@@ -64,9 +59,9 @@ if bashio::config.has_value 'networkdisks'; then
     # 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"
+      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
@@ -76,12 +71,11 @@ if bashio::config.has_value 'networkdisks'; then
       # Provide debugging info
       smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
 
-
       disk="//192.168.178.23/NAS"
       CIFS_USERNAME="homeassistant"
       CIFS_PASSWORD="Bonjour01"
-      #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true 
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
+      #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)"
diff --git a/cloudcommander/rootfs/92-local_mounts.sh b/cloudcommander/rootfs/92-local_mounts.sh
new file mode 100644
index 000000000..96dd3d2f1
--- /dev/null
+++ b/cloudcommander/rootfs/92-local_mounts.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; 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 /share/$disk &&
+        bashio::log.info "Success!"
+    done ||
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
diff --git a/cloudcommander/rootfs/run.sh b/cloudcommander/rootfs/run.sh
index aa6184dc5..f8c7d9082 100644
--- a/cloudcommander/rootfs/run.sh
+++ b/cloudcommander/rootfs/run.sh
@@ -6,62 +6,46 @@
 
 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 " 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)"
+      " 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::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'
+    ' Please, share the above information when looking for help'
   bashio::log.blue \
-  ' or support in, e.g., GitHub, forums or the Discord chat.'
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
   bashio::log.green \
-  ' https://github.com/alexbelgium/hassio-addons'
+    ' https://github.com/alexbelgium/hassio-addons'
   bashio::log.blue \
-  '-----------------------------------------------------------'
+    '-----------------------------------------------------------'
 fi
 
 ######################
-# MOUNT LOCAL SHARES #
+# MOUNT LOCAL SCRIPT #
 ######################
-
-# 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//,/ }; 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
+chown $(id -u):$(id -g) /92-local_mounts.sh
+chmod a+x /92-local_mounts.sh
+sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
+/./92-local_mounts.sh
 
 ######################
 # EXECUTE SMB SCRIPT #
diff --git a/emby/root/etc/cont-init.d/92-local_mounts.sh b/emby/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/emby/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/emby/root/etc/cont-init.d/92-local_mounts_v1.2.sh b/emby/root/etc/cont-init.d/92-local_mounts_v1.2.sh
deleted file mode 100644
index 3d95ff5c9..000000000
--- a/emby/root/etc/cont-init.d/92-local_mounts_v1.2.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    #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 /share/$disk && \
-            bashio::log.info "Success! Mounted to /share/$disk"  
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/filebrowser/rootfs/92-local_mounts.sh b/filebrowser/rootfs/92-local_mounts.sh
new file mode 100644
index 000000000..96dd3d2f1
--- /dev/null
+++ b/filebrowser/rootfs/92-local_mounts.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; 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 /share/$disk &&
+        bashio::log.info "Success!"
+    done ||
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
diff --git a/filebrowser/rootfs/run.sh b/filebrowser/rootfs/run.sh
index d26975e1d..78a2f331d 100644
--- a/filebrowser/rootfs/run.sh
+++ b/filebrowser/rootfs/run.sh
@@ -6,62 +6,46 @@
 
 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 " 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)"
+      " 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::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'
+    ' Please, share the above information when looking for help'
   bashio::log.blue \
-  ' or support in, e.g., GitHub, forums or the Discord chat.'
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
   bashio::log.green \
-  ' https://github.com/alexbelgium/hassio-addons'
+    ' https://github.com/alexbelgium/hassio-addons'
   bashio::log.blue \
-  '-----------------------------------------------------------'
+    '-----------------------------------------------------------'
 fi
 
 ######################
-# MOUNT LOCAL SHARES #
+# MOUNT LOCAL SCRIPT #
 ######################
-
-# 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//,/ }; 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 /share/$disk && \
-    bashio::log.info "Success!"
-  done || \
-  bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi || true
+chown $(id -u):$(id -g) /92-local_mounts.sh
+chmod a+x /92-local_mounts.sh
+sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
+/./92-local_mounts.sh
 
 ######################
 # EXECUTE SMB SCRIPT #
diff --git a/lidarr/root/etc/cont-init.d/92-local_mounts.sh b/lidarr/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/lidarr/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/lidarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/lidarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
deleted file mode 100644
index bdefdc56b..000000000
--- a/lidarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/photoprism/rootfs/92-local_mounts.sh b/photoprism/rootfs/92-local_mounts.sh
new file mode 100644
index 000000000..96dd3d2f1
--- /dev/null
+++ b/photoprism/rootfs/92-local_mounts.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; 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 /share/$disk &&
+        bashio::log.info "Success!"
+    done ||
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi
diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh
index b4ecdf6e4..9fdab8b81 100644
--- a/photoprism/rootfs/run.sh
+++ b/photoprism/rootfs/run.sh
@@ -8,62 +8,46 @@ bashio::log.warning "Warning - minimum configuration recommended : 2 cpu cores a
 
 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 " 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)"
+      " 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::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'
+    ' Please, share the above information when looking for help'
   bashio::log.blue \
-  ' or support in, e.g., GitHub, forums or the Discord chat.'
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
   bashio::log.green \
-  ' https://github.com/alexbelgium/hassio-addons'
+    ' https://github.com/alexbelgium/hassio-addons'
   bashio::log.blue \
-  '-----------------------------------------------------------'
+    '-----------------------------------------------------------'
 fi
 
 ######################
-# MOUNT LOCAL SHARES #
+# MOUNT LOCAL SCRIPT #
 ######################
-
-# 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//,/ }; 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 /share/$disk && \
-    bashio::log.info "Success!"
-  done || \
-  bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi || true
+chown $(id -u):$(id -g) /92-local_mounts.sh
+chmod a+x /92-local_mounts.sh
+sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
+/./92-local_mounts.sh
 
 ######################
 # EXECUTE SMB SCRIPT #
diff --git a/plex/root/etc/cont-init.d/92-local_mounts.sh b/plex/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/plex/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/plex/root/etc/cont-init.d/92-local_mounts_v1.0 b/plex/root/etc/cont-init.d/92-local_mounts_v1.0
deleted file mode 100644
index 6dd2ae565..000000000
--- a/plex/root/etc/cont-init.d/92-local_mounts_v1.0
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    MOREDISKS=$(bashio::config 'localdisks')
-    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
-    for disk in $MOREDISKS 
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts.sh b/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..47b6822ae
--- /dev/null
+++ b/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="mnt"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts_v1.2.sh b/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts_v1.2.sh
deleted file mode 100644
index cd9fff57e..000000000
--- a/qbittorrent/rootfs/etc/cont-init.d/92-local_mounts_v1.2.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /mnt/$disk && \
-            if [ ! -d /mnt/$disk ]; then
-              echo "Creating /mnt/$disk"
-              mkdir -p /mnt/$disk
-              chown -R abc:abc /mnt/$disk
-            fi
-            mount /dev/$disk /mnt/$disk && \
-            bashio::log.info "Success! Mounted to /mnt/$disk"  
-    done || \
-    bashio::log.warning "Unable to mount local drives!"
-fi
diff --git a/radarr/root/etc/cont-init.d/92-local_mounts.sh b/radarr/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/radarr/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/radarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/radarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
deleted file mode 100644
index bdefdc56b..000000000
--- a/radarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/readarr/root/etc/cont-init.d/92-local_mounts.sh b/readarr/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/readarr/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/readarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/readarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
deleted file mode 100644
index bdefdc56b..000000000
--- a/readarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
diff --git a/sonarr/root/etc/cont-init.d/92-local_mounts.sh b/sonarr/root/etc/cont-init.d/92-local_mounts.sh
new file mode 100644
index 000000000..f29116820
--- /dev/null
+++ b/sonarr/root/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+MOUNTPOINTS="share"
+
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+  MOREDISKS=$(bashio::config 'localdisks')
+  bashio::log.info "Local Disks mounting.. ${MOREDISKS}" &&
+    # Separate comma separated values
+    for disk in ${MOREDISKS//,/ }; do
+      bashio::log.info "Mount ${disk}"
+      mkdir -p /$MOUNTPOINTS/$disk &&
+        if [ ! -d /$MOUNTPOINTS/$disk ]; then
+          echo "Creating /$MOUNTPOINTS/$disk"
+          mkdir -p /$MOUNTPOINTS/$disk
+          chown -R abc:abc /$MOUNTPOINTS/$disk
+        fi
+      mount /dev/$disk /$MOUNTPOINTS/$disk &&
+        bashio::log.info "Success! Mounted to /$MOUNTPOINTS/$disk"
+    done ||
+    bashio::log.warning "Unable to mount local drives!"
+fi
diff --git a/sonarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh b/sonarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
deleted file mode 100644
index bdefdc56b..000000000
--- a/sonarr/root/etc/cont-init.d/92-local_mounts_v1.1.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-######################
-# MOUNT LOCAL SHARES #
-######################
-
-bashio::log.info 'Mounting external hdd...'
-
-# Mount local Share if configured and if Protection Mode is active
-if bashio::config.has_value 'localdisks'; then
-    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 /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi