clean code

code-server/root/etc/cont-init.d/50-mounts

@@ -1,43 +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}"
-        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 "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 /share/storagecifs && \
-            if [ ! -d /storage/storagecifs ]; then
-              echo "Creating /storage/storagecifs"
-              mkdir -p /storage/storagecifs
-              chown -R abc:abc /storage/storagecifs
-            fi
-
-            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
-fi

code-server/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..."
+
+  # Separate comma separated values
+  for disk in ${MOREDISKS//,/ }; do
+    # Mount each disk
+    mkdir -p /$MOUNTPOINTS/$disk
+    chown -R $(id -u):$(id -g) /$MOUNTPOINTS/$disk
+    mount /dev/$disk /$MOUNTPOINTS/$disk
+    bashio::log.info "Success! $disk mounted to /$MOUNTPOINTS/$disk" ||
+      # Error message and clean remaining folder
+      (bashio::log.warning "Unable to mount local drives!" &&
+        rmdir /$MOUNTPOINTS/$disk)
+  done
+fi

code-server/root/etc/cont-init.d/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