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

README.md

@@ -5,6 +5,7 @@
 
 [donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
 [update-badge]: https://img.shields.io/github/last-commit/alexbelgium/hassio-addons?label=last%20update
+[support-badge]: https://camo.githubusercontent.com/f4dbb995049f512fdc97fcc9e022ac243fa38c408510df9d46c7467d0970d959/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f537570706f72742d7468726561642d677265656e2e737667
 
 _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
 
@@ -71,7 +72,7 @@ https://github.com/alexbelgium/hassio-addons
 
 ## ✓ Misc tools
 
-- [Addons Updater](addons_updater/) ![support][support-shield] : Automatic addons update by aligning version tag with github upstream releases
+- [Addons Updater](addons_updater/) [![Support Thread][support-badge]](https://community.home-assistant.io/t/new-addon-automatically-update-addons-based-on-github-upstream-new-releases/) : Automatic addons update by aligning version tag with github upstream releases
 - [Arpspoof](arpspoof/): adds ability to block internet connection for local network devices
 - [Code-server](code-server/) : Code-server is VS Code running on a remote server, accessible through the browser.
 - [Inadyn](inadyn/) : Inadyn, or In-a-Dyn, is a small and simple Dynamic DNS, DDNS, client with HTTPS support. Commonly available in many GNU/Linux distributions, used in off the shelf routers and Internet gateways to automate the task of keeping your Internet name in sync with your public¹ IP address. It can also be used in installations with redundant (backup) connections to the Internet.

bazarr/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 - New standardized logic for Dockerfile build and packages installation
 
 ## 1.0.1 (20-11-2021)

bazarr/Dockerfile

@@ -23,9 +23,8 @@ FROM ${BUILD_FROM}
 
 RUN \
     # Correct config folder
-    grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/bazarr|g' \
+    grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \
-    && grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/bazarr|g' \
+    && grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \
-    && sed -i 's=/config/flexget=/config/bazarr || true=g' /etc/cont-init.d/10-adduser \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

bazarr/apparmor.txt

@@ -1,3 +1,4 @@
+
 #include <tunables/global>
 
 profile bazarr_addon flags=(attach_disconnected,mediate_deleted) {

bazarr/config.json

@@ -66,6 +66,6 @@
   "startup": "services",
   "upstream": "1.0.1",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.0.1",
+  "version": "1.0.1-2",
   "webui": "http://[HOST]:[PORT:6767]"
 }

bazarr/rootfs/etc/cont-init.d/20-folders

@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /share/storage/movies ]; then
-  echo "Creating /share/storage/movies"
-  mkdir -p /share/storage/movies
-  chown -R abc:abc /share/storage/movies
-fi
-
-if [ ! -d /share/downloads ]; then
-  echo "Creating /share/downloads"
-  mkdir -p /share/downloads
-  chown -R abc:abc /share/downloads
-fi
-
-if [ ! -d /config/bazarr ]; then
-  echo "Creating /config/bazarr"
-  mkdir -p /config/bazarr
-  chown -R abc:abc /config/bazarr
-fi

bazarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /share/storage/movies ]; then
+  echo "Creating /share/storage/movies"
+  mkdir -p /share/storage/movies
+  chown -R abc:abc /share/storage/movies
+fi
+
+if [ ! -d /share/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ -d /config/bazarr ]; then
+  echo "Moving to new location /config/addons_config/bazarr"
+  mkdir -p /config/addons_config/bazarr
+  chown -R abc:abc /config/addons_config/bazarr
+  mv /config/bazarr/* /config/addons_config/bazarr/
+fi
+
+if [ ! -d /config/addons_config/bazarr ]; then
+  echo "Creating /config/addons_config/bazarr"
+  mkdir -p /config/addons_config/bazarr
+  chown -R abc:abc /config/addons_config/bazarr
+fi

cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf

@@ -1,3 +1,4 @@
+
 ssl_protocols TLSv1.2;
 ssl_prefer_server_ciphers on;
 ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;

cloudcommander/rootfs/etc/nginx/includes/upstream.conf

@@ -1,3 +1,4 @@
+
 upstream backend {
     server 127.0.0.1:8000;
 } 

filebrowser/rootfs/etc/nginx/nginx.conf

@@ -1,3 +1,4 @@
+
 # Run nginx in foreground.
 daemon off;
 

jackett/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 
 ## 0.20.200 (28-12-2021)
 - Update to latest version from linuxserver/docker-jackett

jackett/Dockerfile

@@ -1,13 +1,13 @@
 #==========================#
 # ALEXBELGIUM'S DOCKERFILE #
 #==========================#
-#           _.------.
+#           _.------.
-#       _.-`    ('>.-`"""-.
+#       _.-`    ('>.-`"""-.
-# '.--'`       _'`   _ .--.)
+# '.--'`       _'`   _ .--.)
-#    -'         '-.-';`   `
+#    -'         '-.-';`   `
-#    ' -      _.'  ``'--. 
+#    ' -      _.'  ``'--. 
-#        '---`    .-'""`
+#        '---`    .-'""`
-#               /`
+#               /`
 
 #################
 # 1 Build Image #
@@ -22,8 +22,8 @@ FROM ${BUILD_FROM}
 ##################
 
 # use /data instead of /config for hass.io environment
-RUN sed -i "s|/config|/config/Jackett|g" /etc/services.d/jackett/run \
+RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \
-    && sed -i "s|/config|/config/Jackett|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

jackett/rootfs/etc/cont-init.d/20-folders.sh

@@ -12,6 +12,13 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
+if [ -d /config/Jackett ]; then
+  echo "Moving to new location /config/addons_config/Jackett"
+  mkdir -p /config/addons_config/Jackett
+  chown -R abc:abc /config/addons_config/Jackett
+  mv /config/jackett/* /config/addons_config/Jackett/
+fi
+
 if [ ! -d /config/addons_config/Jackett ]; then
   echo "Creating /config/addons_config/Jackett"
   mkdir -p /config/addons_config/Jackett

jellyfin/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 - New standardized logic for Dockerfile build and packages installation
 - Add local mount (see readme)
 - Added watchdog feature

jellyfin/Dockerfile

@@ -26,9 +26,9 @@ RUN \
     sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i "s|/config|/config/jellyfin|g" /etc/services.d/jellyfin/run \
+    && sed -i "s|/config|/config/addons_config/jellyfin|g" /etc/services.d/jellyfin/run \
-    && sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/10-adduser \
+    && sed -i "s|/config|/config/addons_config/jellyfin|g" /etc/cont-init.d/10-adduser \
-    && sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/30-config
+    && sed -i "s|/config|/config/addons_config/jellyfin|g" /etc/cont-init.d/30-config
 
 ##################
 # 3 Install apps #

jellyfin/rootfs/etc/cont-init.d/20-folders.sh

@@ -39,13 +39,20 @@ if [ ! -d /jellyfin/cache ]; then
   ln -s /share/jellyfin/cache /jellyfin/cache
 fi
 
-if [ ! -d /jellyfin/config ]; then
+if [ -d /config/jellyfin ]; then
-  echo "Creating link for /jellyfin/config"
+  echo "Moving to new location /config/addons_config/jellyfin"
-  mkdir -p /config/jellyfin
+  mkdir -p /config/addons_config/jellyfin
-  chown -R abc:abc /config/jellyfin
+  chown -R abc:abc /config/addons_config/jellyfin
-  ln -s /config/jellyfin /jellyfin/config
+  mv /config/jellyfin/* /config/addons_config/jellyfin/
 fi
 
+if [ ! -d /config/addons_config/jellyfin ]; then
+  echo "Creating /config/addons_config/jellyfin"
+  mkdir -p /config/addons_config/jellyfin
+  chown -R abc:abc /config/addons_config/jellyfin
+fi
+
+
 if [ ! -d /jellyfin/data ]; then
   echo "Creating link for /jellyfin/data"
   mkdir -p /share/jellyfin/data

joal/rootfs/etc/nginx/includes/proxy_params.conf

@@ -1,3 +1,4 @@
+
 proxy_http_version          1.1;
 proxy_ignore_client_abort   off;
 proxy_read_timeout          86400s;

joal/rootfs/etc/nginx/nginx.conf

@@ -1,3 +1,4 @@
+
 # Run nginx in foreground.
 daemon off;
 

joal/rootfs/etc/nginx/servers/ingress.conf

@@ -1,3 +1,4 @@
+
 server {
     listen %%interface%%:%%port%% default_server;
 

lidarr/Readme.md

@@ -1,3 +1,4 @@
+
 # Home assistant add-on: Lidarr
 
 [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)

lidarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -11,9 +11,3 @@ if [ ! -d /share/downloads ]; then
   mkdir -p /share/downloads
   chown -R abc:abc /share/downloads
 fi
-
-if [ ! -d /config/lidarr ]; then
-  echo "Creating /config/lidarr"
-  mkdir -p /config/lidarr
-  chown -R abc:abc /config/lidarr
-fi 

nextcloud/Dockerfile

@@ -26,7 +26,10 @@ FROM ${BUILD_FROM}
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 
 RUN \
-    chmod +x /defaults/nextcloud-perms.sh \
+    # Remove upstream files
+    rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \	
+    # Make permissions
+    && chmod +x /defaults/nextcloud-perms.sh \
     # default folders
     && sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \
     && sed -i "s|config|data/config|g" /etc/cont-init.d/* \

portainer/rootfs/etc/services.d/nginx/finish

@@ -1,3 +1,4 @@
+
 #!/usr/bin/execlineb -S0
 # ==============================================================================
 # Take down the S6 supervision tree when Nginx fails

prowlarr/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 
 ## nightly-alpine-0.1.9.1313-ls2 (29-12-2021)
 - Update to latest version from linuxserver/docker-prowlarr

prowlarr/Dockerfile

@@ -28,9 +28,9 @@ RUN \
     && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
     \
     # Correct permissions 
-    && sed -i 's|/config|-R /config/prowlarr|g' /etc/cont-init.d/10-adduser \    
+    && sed -i 's|/config|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \    
-    && sed -i 's=	/config=/config/prowlarr || true=g' /etc/cont-init.d/30-config \
+    && sed -i 's=	/config=/config/addons_config/prowlarr || true=g' /etc/cont-init.d/30-config \
-    && sed -i 's|/config|/config/prowlarr|g' /etc/services.d/prowlarr/run
+    && sed -i 's|/config|/config/addons_config/prowlarr|g' /etc/services.d/prowlarr/run
 
 ##################
 # 3 Install apps #

prowlarr/config.json

@@ -49,6 +49,6 @@
   "startup": "services",
   "upstream": "nightly-alpine-0.1.9.1313-ls2",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "nightly-alpine-0.1.9.1313-ls2",
+  "version": "nightly-alpine-0.1.9.1313-ls2-2",
   "webui": "http://[HOST]:[PORT:9696]"
 }

prowlarr/rootfs/etc/cont-init.d/20-folders

@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /config/prowlarr ]; then
-  echo "Creating /config/radarr"
-  mkdir -p /config/prowlarr
-  chown -R abc:abc /config/prowlarr
-fi

prowlarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+if [ -d /config/prowlarr ]; then
+  echo "Moving to new location /config/addons_config/prowlarr"
+  mkdir -p /config/addons_config/prowlarr
+  chown -R abc:abc /config/addons_config/prowlarr
+  mv /config/prowlarr/* /config/addons_config/prowlarr/
+fi
+
+if [ ! -d /config/addons_config/prowlarr ]; then
+  echo "Creating /config/addons_config/prowlarr"
+  mkdir -p /config/addons_config/prowlarr
+  chown -R abc:abc /config/addons_config/prowlarr
+fi

radarr/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 - New standardized logic for Dockerfile build and packages installation
 - Allow mounting local drives by label. Just pust the label instead of sda1 for example
 - Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename

radarr/Dockerfile

@@ -23,8 +23,8 @@ FROM ${BUILD_FROM}
 
 RUN \
     # use /data instead of /config for hass.io environment
-    sed -i "s|/config|/config/radarr|g" /etc/services.d/radarr/run \
+    sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \
-    && sed -i "s|/config|/config/radarr|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/config|/config/addons_config/radarr|g" /etc/cont-init.d/30-config \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

radarr/config.json

@@ -69,6 +69,6 @@
   "startup": "services",
   "upstream": "3.2.2.5080",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "3.2.2.5080-5",
+  "version": "3.2.2.5080-6",
   "webui": "http://[HOST]:[PORT:7878]"
 }

radarr/rootfs/etc/cont-init.d/00-ha-env.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bashio
 
 for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
-    printf "$(bashio::config $k)" >/var/run/s6/container_environment/$k
+    printf "$(bashio::config "$k")" >/var/run/s6/container_environment/"$k"
 done

radarr/rootfs/etc/cont-init.d/20-folders

@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /share/storage/movies ]; then
-  echo "Creating /share/storage/movies"
-  mkdir -p /share/storage/movies
-  chown -R abc:abc /share/storage/movies
-fi
-
-if [ ! -d /share/downloads ]; then
-  echo "Creating /share/downloads"
-  mkdir -p /share/downloads
-  chown -R abc:abc /share/downloads
-fi
-
-if [ ! -d /config/radarr ]; then
-  echo "Creating /config/radarr"
-  mkdir -p /config/radarr
-  chown -R abc:abc /config/radarr
-fi

radarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /share/storage/movies ]; then
+  echo "Creating /share/storage/movies"
+  mkdir -p /share/storage/movies
+  chown -R abc:abc /share/storage/movies
+fi
+
+if [ ! -d /share/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ -d /config/radarr ]; then
+  echo "Moving to new location /config/addons_config/radarr"
+  mkdir -p /config/addons_config/radarr
+  chown -R abc:abc /config/addons_config/radarr
+  mv /config/radarr/* /config/addons_config/radarr/
+fi
+
+if [ ! -d /config/addons_config/radarr ]; then
+  echo "Creating /config/addons_config/radarr"
+  mkdir -p /config/addons_config/radarr
+  chown -R abc:abc /config/addons_config/radarr
+fi
+

radarr/rootfs/etc/cont-init.d/92-local_mounts.sh

@@ -17,15 +17,15 @@ if bashio::config.has_value 'localdisks'; then
     devpath=/dev
 
     # Mount as label
-    [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label
+    [ "${disk:0:2}" != "sd" ] && devpath=/dev/disk/by-label
 
     # Creates dir
-    mkdir -p /mnt/$disk
+    mkdir -p /mnt/"$disk"
-    chown -R $(id -u):$(id -g) /mnt/$disk
+    chown -R "$(id -u):$(id -g)" /mnt/"$disk"
     # Legacy mounting : mount to share if still exists (avoid breaking changes)
-    [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true
+    [ -d /share/"$disk" ] && mount $devpath/"$disk" /share/"$disk" || true
     # Mount
-    mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
+    mount $devpath/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
 
   done
 

radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh

@@ -26,7 +26,7 @@ if bashio::config.has_value 'networkdisks'; then
   for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
 
     # Clean name of network share
-    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    disk=$(echo "$disk" | sed "s,/$,,") # Remove / at end of name
     diskname=${disk//\\//}            #replace \ with /
     diskname=${diskname##*/}          # Get only last part of the name
 
@@ -37,18 +37,18 @@ if bashio::config.has_value 'networkdisks'; then
     fi
 
     # Prepare mount point
-    mkdir -p /mnt/$diskname
+    mkdir -p /mnt/"$diskname"
-    chown -R root:root /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
+    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
+        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
+          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
@@ -56,7 +56,7 @@ 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 &&
+      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"
 
@@ -68,15 +68,15 @@ if bashio::config.has_value 'networkdisks'; then
       # 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
+      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
+      umount /mnt/"$diskname" 2>/dev/null || true
-      rmdir /mnt/$diskname || true
+      rmdir /mnt/"$diskname" || true
     fi
 
   done

readarr/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 
 ## nightly-0.1.0.1149-ls59 (28-12-2021)
 - Update to latest version from linuxserver/docker-readarr

readarr/Dockerfile

@@ -22,8 +22,8 @@ ENV BASHIO_VERSION=0.14.3
 # 2 Modify Image #
 ##################
 
-RUN sed -i "s|/config|/config/readarr|g" /etc/services.d/readarr/run \
+RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/readarr/run \
-    && sed -i "s|/config|/config/readarr|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/cont-init.d/30-config \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

readarr/config.json

@@ -79,6 +79,6 @@
   "slug": "readarr_nas",
   "upstream": "nightly-0.1.0.1149-ls59",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "nightly-0.1.0.1149-ls59",
+  "version": "nightly-0.1.0.1149-ls59-2",
   "webui": "http://[HOST]:[PORT:8787]"
 }

readarr/rootfs/etc/cont-init.d/20-folders

@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-if [ ! -d /share/music ]; then
-  echo "Creating /share/music"
-  mkdir -p /share/music
-  chown -R abc:abc /share/music
-fi
-
-if [ ! -d /share/downloads ]; then
-  echo "Creating /share/downloads"
-  mkdir -p /share/downloads
-  chown -R abc:abc /share/downloads
-fi
-
-if [ ! -d /config/readarr ]; then
-  echo "Creating /config/readarr"
-  mkdir -p /config/readarr
-  chown -R abc:abc /config/readarr
-fi 

readarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+
+if [ ! -d /share/music ]; then
+  echo "Creating /share/music"
+  mkdir -p /share/music
+  chown -R abc:abc /share/music
+fi
+
+if [ ! -d /share/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ -d /config/readarr ]; then
+  echo "Moving to new location /config/addons_config/readarr"
+  mkdir -p /config/addons_config/readarr
+  chown -R abc:abc /config/addons_config/readarr
+  mv /config/readarr/* /config/addons_config/readarr/
+fi
+
+if [ ! -d /config/addons_config/readarr ]; then
+  echo "Creating /config/addons_config/readarr"
+  mkdir -p /config/addons_config/readarr
+  chown -R abc:abc /config/addons_config/readarr
+fi

sonarr/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 - New standardized logic for Dockerfile build and packages installation
 - Allow mounting local drives by label. Just pust the label instead of sda1 for example
 - Allow mounting local drives by label. Just pust the label instead of sda1 for example

sonarr/Dockerfile

@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 RUN \
     # use /data instead of /config for hass.io environment
-    sed -i "s|/config|/config/sonarr|g" /etc/services.d/sonarr/run \
+    sed -i "s|/config|/config/addons_config/sonarr|g" /etc/services.d/sonarr/run \
-    && sed -i "s|/config|/config/sonarr|g" /etc/cont-init.d/30-config \
+    && sed -i "s|/config|/config/addons_config/sonarr|g" /etc/cont-init.d/30-config \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

sonarr/config.json

@@ -69,6 +69,6 @@
   "startup": "services",
   "upstream": "3.0.6.1342",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "3.0.6.1342-4",
+  "version": "3.0.6.1342-5",
   "webui": "http://[HOST]:[PORT:8989]"
 }

sonarr/rootfs/etc/cont-init.d/00-ha-env

@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
-    printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k
-done

sonarr/rootfs/etc/cont-init.d/20-folders

@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ ! -d /share/storage/movies ]; then
-  echo "Creating /share/storage/movies"
-  mkdir -p /share/storage/movies
-  chown -R abc:abc /share/storage/movies
-fi
-
-if [ ! -d /share/downloads ]; then
-  echo "Creating /share/downloads"
-  mkdir -p /share/downloads
-  chown -R abc:abc /share/downloads
-fi
-
-if [ ! -d /config/sonarr ]; then
-  echo "Creating /config/sonarr"
-  mkdir -p /config/sonarr
-  chown -R abc:abc /config/sonarr
-fi

sonarr/rootfs/etc/cont-init.d/20-folders.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /share/storage/movies ]; then
+  echo "Creating /share/storage/movies"
+  mkdir -p /share/storage/movies
+  chown -R abc:abc /share/storage/movies
+fi
+
+if [ ! -d /share/downloads ]; then
+  echo "Creating /share/downloads"
+  mkdir -p /share/downloads
+  chown -R abc:abc /share/downloads
+fi
+
+if [ -d /config/sonarr ]; then
+  echo "Moving to new location /config/addons_config/sonarr"
+  mkdir -p /config/addons_config/sonarr
+  chown -R abc:abc /config/addons_config/sonarr
+  mv /config/sonarr/* /config/addons_config/sonarr/
+fi
+
+if [ ! -d /config/addons_config/sonarr ]; then
+  echo "Creating /config/addons_config/sonarr"
+  mkdir -p /config/addons_config/sonarr
+  chown -R abc:abc /config/addons_config/sonarr
+fi

transmission/rootfs/etc/cont-init.d/19-config.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/with-contenv bashio
 
+rm -rf /etc/cont-init.d/20-config || true
+
 declare CONFIG
 declare incomplete_bool
 declare download_dir

whoogle/rootfs/scripts/90-config_yaml.sh

@@ -8,7 +8,7 @@
 CONFIGSOURCE=$(bashio::config "CONFIG_LOCATION")
 
 # Check if config file is there, or create one from template
-if [ -f $CONFIGSOURCE ]; then
+if [ -f "$CONFIGSOURCE" ]; then
     echo "Using config file found in $CONFIGSOURCE"
 else
     echo "No config file, creating one from template"
@@ -21,7 +21,7 @@ else
     else
         # Download template
         TEMPLATESOURCE="https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/config.template"
-        curl -L -f -s $TEMPLATESOURCE --output $CONFIGSOURCE
+        curl -L -f -s $TEMPLATESOURCE --output "$CONFIGSOURCE"
     fi
     # Need to restart
     bashio::log.fatal "Config file not found, creating a new one. Please customize the file in $CONFIGSOURCE before restarting."
@@ -55,7 +55,7 @@ function parse_yaml {
       for (i in vname) {if (i > indent) {delete vname[i]}}
       if (length($3) > 0) {
          vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
-         printf("%s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3);
+         printf("%s%s%s=\"%s\"\n", "'"$prefix"'",vn, $2, $3);
       }
      }'
 }
@@ -73,7 +73,7 @@ while IFS= read -r line; do
         secret=${line#*secret }
         # Check if single match
         secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml)
-        [[ $(echo $secretnum) == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file"
+        [[ $(echo "$secretnum") == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file"
         # Get text
         secret=$(sed -n "/$secret:/p" /config/secrets.yaml)
         secret=${secret#*: }
@@ -81,7 +81,7 @@ while IFS= read -r line; do
     fi
     # Data validation
     if [[ $line =~ ^.+[=].+$ ]]; then
-        export $line
+        export "{$line}"
         # Export the variable
         sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true
         sed -i "1a export $line" /scripts/*run* 2>/dev/null || true
@@ -94,9 +94,9 @@ done <"/tmpfile"
 
 # Test mode
 TZ=$(bashio::config "TZ")
-if [ $TZ = "test" ]; then
+if [ "$TZ" = "test" ]; then
     echo "secret mode found, launching script in /config/test.sh"
-    cd /config
+    cd /config || exit
     chmod 777 test.sh
     ./test.sh
 fi

zzz_templates/00-bettercomments.sh

@@ -1,4 +1,4 @@
-#!bin/bash
+#!/bin/bash
 
 # Color comments
 #! Red