Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

emby/config.json

@@ -1,6 +1,6 @@
 {
   "name": "emby_nas",
-  "version": "1.6",
+  "version": "1.8",
   "slug": "emby_nas",
   "legacy": false,
   "maintenance": {
@@ -36,8 +36,8 @@
   "options": {
     "PUID": 1001,
     "PGID": 1001,
-    "localdisks": ["/dev/sdb1"],
+    "localdisks": "/dev/sdb1",
-    "networkdisks": ["<//SERVER/SHARE>"],
+    "networkdisks": "<//SERVER/SHARE>",
     "cifsusername": "<username>",
     "cifspassword": "<password>"
   },
@@ -45,8 +45,8 @@
     "PUID": "int",
     "PGID": "int",
     "TZ": "str?",
-    "localdisks": ["str"],
+    "localdisks": "str",
-    "networkdisks": ["str"],
+    "networkdisks": "str",
     "cifsusername": "str",
     "cifspassword": "str"
   }

emby/root/config/custom-cont-init.d/mount

@@ -1,31 +0,0 @@
-#!/usr/bin/with-contenv bashio
-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}"
-            mount $disk /share/storage && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
-
-# Mount CIFS Share if configured and if Protection Mode is active
-if bashio::config.has_value 'networkdisks'; then
-    MOREDISKS=$(bashio::config 'networkdisks')
-    CIFS_USERNAME=$(bashio::config 'cifsusername')
-    CIFS_PASSWORD=$(bashio::config 'cifspassword')
-    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
-    for disk in $MOREDISKS 
-    do
-        bashio::log.info "Mount ${disk}"
-        mkdir -p /$disk && \
-            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
-fi

emby/root/etc/cont-init.d/50-mounts

@@ -10,8 +10,7 @@ if bashio::config.has_value 'localdisks'; then
     for disk in $MOREDISKS 
     do
         bashio::log.info "Mount ${disk}"
-        mkdir -p /$disk && \
+        mkdir -p /share/storage && \
-
             if [ ! -d /share/storage ]; then
               echo "Creating /share/storage"
               mkdir -p /share/storage
@@ -33,8 +32,14 @@ if bashio::config.has_value 'networkdisks'; then
     for disk in $MOREDISKS 
     do
         bashio::log.info "Mount ${disk}"
-        mkdir -p /$disk && \
+        mkdir -p /share/storagecifs && \
-            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /$disk && \
+            if [ ! -d /share/storagecifs ]; then
+              echo "Creating /share/storagecifs"
+              mkdir -p /share/storagecifs
+              chown -R abc:abc /share/storagecifs
+            fi
+
+            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \
             bashio::log.info "Success!"   
     done || \
     bashio::log.warning "Protection mode is ON. Unable to mount external drives!"