From 172404cc1c43f9ab5cf5886f47fc51f8b77f24a7 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:33:41 +0100
Subject: [PATCH 01/48] Change config file location

Make sure to use a special folder for the config files.
---
 radarr/rootfs/etc/cont-init.d/20-folders | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/radarr/rootfs/etc/cont-init.d/20-folders b/radarr/rootfs/etc/cont-init.d/20-folders
index 9fcadd756..c6e2b0959 100644
--- a/radarr/rootfs/etc/cont-init.d/20-folders
+++ b/radarr/rootfs/etc/cont-init.d/20-folders
@@ -13,7 +13,7 @@ if [ ! -d /share/downloads ]; then
 fi
 
 if [ ! -d /config/radarr ]; then
-  echo "Creating /config/radarr"
-  mkdir -p /config/radarr
-  chown -R abc:abc /config/radarr
+  echo "Creating /config/addons_config/radarr"
+  mkdir -p /config/addons_config/radarr
+  chown -R abc:abc /config/addons_config/radarr
 fi

From 5858c74e75d4c6eb9cd426f11ea7d1698db841a6 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:41:07 +0100
Subject: [PATCH 02/48] make sure to move the folder config

---
 sonarr/rootfs/etc/cont-init.d/20-folders | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders b/sonarr/rootfs/etc/cont-init.d/20-folders
index 17b3689df..966892719 100644
--- a/sonarr/rootfs/etc/cont-init.d/20-folders
+++ b/sonarr/rootfs/etc/cont-init.d/20-folders
@@ -12,8 +12,15 @@ if [ ! -d /share/downloads ]; then
   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
+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

From defafff458243d60b85b9c81d0f0f230f12e82f6 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:41:50 +0100
Subject: [PATCH 03/48] Changed to new config

---
 jackett/rootfs/etc/cont-init.d/20-folders | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/jackett/rootfs/etc/cont-init.d/20-folders b/jackett/rootfs/etc/cont-init.d/20-folders
index 0a8112e46..e3e3ca829 100644
--- a/jackett/rootfs/etc/cont-init.d/20-folders
+++ b/jackett/rootfs/etc/cont-init.d/20-folders
@@ -12,8 +12,15 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
-if [ ! -d /config/jackett ]; then
-  echo "Creating /config/jackett"
-  mkdir -p /config/jackett
-  chown -R abc:abc /config/jackett
+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/sonarr/* /config/addons_config/jackett/
+fi
+
+if [ ! -d /config/addons_config/jackett ]; then
+  echo "Creating /config/addons_config/jackett"
+  mkdir -p /config/addons_config/jackett
+  chown -R abc:abc /config/addons_config/jackett
 fi

From a712e1ad61e530bfebbb628253ff0ced24d5f105 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:42:26 +0100
Subject: [PATCH 04/48] Changed to new folder

---
 radarr/rootfs/etc/cont-init.d/20-folders | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/radarr/rootfs/etc/cont-init.d/20-folders b/radarr/rootfs/etc/cont-init.d/20-folders
index c6e2b0959..c7bb5e392 100644
--- a/radarr/rootfs/etc/cont-init.d/20-folders
+++ b/radarr/rootfs/etc/cont-init.d/20-folders
@@ -12,8 +12,16 @@ if [ ! -d /share/downloads ]; then
   chown -R abc:abc /share/downloads
 fi
 
-if [ ! -d /config/radarr ]; then
+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/sonarr/* /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
+

From 29867e1b655df95803446369a2f416095b1bd6e0 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:44:01 +0100
Subject: [PATCH 05/48] Changed to new config folder

---
 readarr/rootfs/etc/cont-init.d/20-folders | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/readarr/rootfs/etc/cont-init.d/20-folders b/readarr/rootfs/etc/cont-init.d/20-folders
index 5c72643cd..4b0c919f2 100644
--- a/readarr/rootfs/etc/cont-init.d/20-folders
+++ b/readarr/rootfs/etc/cont-init.d/20-folders
@@ -12,8 +12,15 @@ if [ ! -d /share/downloads ]; then
   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 
+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

From 36d204c0bbb28f10f867abe851e4969709346819 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:44:17 +0100
Subject: [PATCH 06/48] Update 20-folders

---
 jackett/rootfs/etc/cont-init.d/20-folders | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jackett/rootfs/etc/cont-init.d/20-folders b/jackett/rootfs/etc/cont-init.d/20-folders
index e3e3ca829..e687b62e0 100644
--- a/jackett/rootfs/etc/cont-init.d/20-folders
+++ b/jackett/rootfs/etc/cont-init.d/20-folders
@@ -16,7 +16,7 @@ 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/sonarr/* /config/addons_config/jackett/
+  mv /config/jackett/* /config/addons_config/jackett/
 fi
 
 if [ ! -d /config/addons_config/jackett ]; then

From 07fbe94ab1f3f51f73d4e8863edfef0b5c2d0b41 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:44:37 +0100
Subject: [PATCH 07/48] Update 20-folders

---
 radarr/rootfs/etc/cont-init.d/20-folders | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radarr/rootfs/etc/cont-init.d/20-folders b/radarr/rootfs/etc/cont-init.d/20-folders
index c7bb5e392..3bced21b4 100644
--- a/radarr/rootfs/etc/cont-init.d/20-folders
+++ b/radarr/rootfs/etc/cont-init.d/20-folders
@@ -16,7 +16,7 @@ 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/sonarr/* /config/addons_config/radarr/
+  mv /config/radarr/* /config/addons_config/radarr/
 fi
 
 if [ ! -d /config/addons_config/radarr ]; then

From d3d9bc63e2cb8a2dbb78afc34a802c670ee7c5c4 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 26 Dec 2021 18:34:20 +0100
Subject: [PATCH 08/48] Addon requires capital letter

Currently, of the two folders, only the one with the capital J is used. As I couldn't easily find how to change this option, it could be best to use the Jackett folder. It should also limit breaking changes.
---
 jackett/rootfs/etc/cont-init.d/20-folders | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jackett/rootfs/etc/cont-init.d/20-folders b/jackett/rootfs/etc/cont-init.d/20-folders
index e687b62e0..cd72debcd 100644
--- a/jackett/rootfs/etc/cont-init.d/20-folders
+++ b/jackett/rootfs/etc/cont-init.d/20-folders
@@ -12,15 +12,15 @@ 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/
+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
-  chown -R abc:abc /config/addons_config/jackett
+if [ ! -d /config/addons_config/Jackett ]; then
+  echo "Creating /config/addons_config/Jackett"
+  mkdir -p /config/addons_config/Jackett
+  chown -R abc:abc /config/addons_config/Jackett
 fi

From 264773e3ff31717bb3f66807d59e0b97b7038b9b Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 26 Dec 2021 18:43:57 +0100
Subject: [PATCH 09/48] Align the config folder in ENV variable

---
 jackett/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index c36227757..40f5dc7ce 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -22,14 +22,18 @@ 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 \
-    && sed -i "s|/config|/config/jackett|g" /etc/cont-init.d/30-config \
+RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \
+    && 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 \
     && 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
 
+# Changes config directory
+ENV XDG_DATA_HOME="/config/addons_config" \
+    XDG_CONFIG_HOME="/config/addons_config"
+
 ##################
 # 3 Install apps #
 ##################

From cfc2bfb83d5a17e16bfd3631a067ef6aaf0a7439 Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 19:45:24 +0100
Subject: [PATCH 10/48] Update config.json

---
 jackett/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jackett/config.json b/jackett/config.json
index a1fcd6e73..53c1f954e 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -45,6 +45,6 @@
   "startup": "services",
   "upstream": "0.20.197",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "0.20.197",
+  "version": "0.20.197-3",
   "webui": "http://[HOST]:[PORT:9117]"
 }

From 0769663a744cb67042deb8e4d59df9c4493fd13d Mon Sep 17 00:00:00 2001
From: bruvv <3063928+bruvv@users.noreply.github.com>
Date: Sun, 26 Dec 2021 19:46:20 +0100
Subject: [PATCH 11/48] Update Dockerfile

---
 jackett/Dockerfile | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 40f5dc7ce..191c9f1d5 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -1,13 +1,13 @@
 #==========================#
 # ALEXBELGIUM'S DOCKERFILE #
 #==========================#
-#           _.------.
-#       _.-`    ('>.-`"""-.
-# '.--'`       _'`   _ .--.)
-#    -'         '-.-';`   `
-#    ' -      _.'  ``'--. 
-#        '---`    .-'""`
-#               /`
+#           _.------.
+#       _.-`    ('>.-`"""-.
+# '.--'`       _'`   _ .--.)
+#    -'         '-.-';`   `
+#    ' -      _.'  ``'--. 
+#        '---`    .-'""`
+#               /`
 
 #################
 # 1 Build Image #
@@ -22,18 +22,14 @@ FROM ${BUILD_FROM}
 ##################
 
 # use /data instead of /config for hass.io environment
-RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \
-    && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \
+RUN sed -i "s|/config|/config/jackett|g" /etc/services.d/jackett/run \
+    && sed -i "s|/config|/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 \
     && 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
 
-# Changes config directory
-ENV XDG_DATA_HOME="/config/addons_config" \
-    XDG_CONFIG_HOME="/config/addons_config"
-
 ##################
 # 3 Install apps #
 ##################

From 87615ff031a6031ee06ac48a5ac0b48b2461da5e Mon Sep 17 00:00:00 2001
From: Bruvv <nvoorn@gmail.com>
Date: Mon, 27 Dec 2021 10:28:02 +0100
Subject: [PATCH 12/48] fixed End Of Line Sequence

---
 arpspoof/rootfs/scripts/99-run.sh                                | 1 +
 bazarr/apparmor.txt                                              | 1 +
 bazarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}        | 0
 bazarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}      | 0
 cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf         | 1 +
 cloudcommander/rootfs/etc/nginx/includes/upstream.conf           | 1 +
 emby/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}        | 0
 filebrowser/rootfs/etc/nginx/nginx.conf                          | 1 +
 grav/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}          | 0
 grav/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}        | 0
 jackett/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}     | 0
 jellyfin/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}      | 0
 jellyfin/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}    | 0
 joal/rootfs/etc/nginx/includes/proxy_params.conf                 | 1 +
 joal/rootfs/etc/nginx/nginx.conf                                 | 1 +
 joal/rootfs/etc/nginx/servers/ingress.conf                       | 1 +
 lidarr/Readme.md                                                 | 1 +
 lidarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}      | 0
 nextcloud/rootfs/etc/cont-init.d/{10-adduser => 10-adduser.sh}   | 0
 nextcloud/rootfs/etc/cont-init.d/{30-keygen => 30-keygen.sh}     | 0
 nextcloud/rootfs/etc/cont-init.d/{40-config => 40-config.sh}     | 0
 nextcloud/rootfs/etc/cont-init.d/{50-install => 50-install.sh}   | 0
 nextcloud/rootfs/etc/cont-init.d/{60-memcache => 60-memcache.sh} | 0
 .../etc/cont-init.d/{99-elasticsearch => 99-elasticsearch.sh}    | 0
 nextcloud/rootfs/etc/cont-init.d/{99-ocr => 99-ocr.sh}           | 0
 .../cont-init.d/{99-trusted_domains => 99-trusted_domains.sh}    | 0
 organizr/rootfs/etc/cont-init.d/{00-folders => 00-folders.sh}    | 0
 papermerge/rootfs/etc/cont-init.d/{91-OCR => 91-OCR.sh}          | 0
 .../etc/cont-init.d/{99-configuration => 99-configuration.sh}    | 0
 plex/rootfs/etc/cont-init.d/{21-folders => 21-folders.sh}        | 0
 .../etc/cont-init.d/{90-create_links => 90-create_links.sh}      | 0
 portainer/rootfs/etc/services.d/nginx/finish                     | 1 +
 prowlarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}      | 0
 prowlarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}    | 0
 qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh                 | 1 +
 radarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}        | 0
 radarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}      | 0
 readarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}       | 0
 readarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}     | 0
 sonarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh}        | 0
 sonarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh}      | 0
 transmission/rootfs/etc/cont-init.d/{20-config => 20-config.sh}  | 0
 webtop/rootfs/etc/cont-init.d/92-local_mounts.sh                 | 1 +
 webtrees/rootfs/entrypoint.sh                                    | 1 +
 webtrees/rootfs/scripts/90-config_yaml.sh                        | 1 +
 zzz_templates/00-aaa_dockerfile_backup.sh                        | 1 +
 zzz_templates/00-bettercomments.sh                               | 1 +
 47 files changed, 16 insertions(+)
 rename bazarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename bazarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename emby/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename grav/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename grav/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename jackett/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename jellyfin/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename jellyfin/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename lidarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{10-adduser => 10-adduser.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{30-keygen => 30-keygen.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{40-config => 40-config.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{50-install => 50-install.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{60-memcache => 60-memcache.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{99-elasticsearch => 99-elasticsearch.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{99-ocr => 99-ocr.sh} (100%)
 rename nextcloud/rootfs/etc/cont-init.d/{99-trusted_domains => 99-trusted_domains.sh} (100%)
 rename organizr/rootfs/etc/cont-init.d/{00-folders => 00-folders.sh} (100%)
 rename papermerge/rootfs/etc/cont-init.d/{91-OCR => 91-OCR.sh} (100%)
 rename papermerge/rootfs/etc/cont-init.d/{99-configuration => 99-configuration.sh} (100%)
 rename plex/rootfs/etc/cont-init.d/{21-folders => 21-folders.sh} (100%)
 rename plex/rootfs/etc/cont-init.d/{90-create_links => 90-create_links.sh} (100%)
 rename prowlarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename prowlarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename radarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename radarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename readarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename readarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename sonarr/rootfs/etc/cont-init.d/{00-ha-env => 00-ha-env.sh} (100%)
 rename sonarr/rootfs/etc/cont-init.d/{20-folders => 20-folders.sh} (100%)
 rename transmission/rootfs/etc/cont-init.d/{20-config => 20-config.sh} (100%)

diff --git a/arpspoof/rootfs/scripts/99-run.sh b/arpspoof/rootfs/scripts/99-run.sh
index 189fe4877..a97d9a981 100644
--- a/arpspoof/rootfs/scripts/99-run.sh
+++ b/arpspoof/rootfs/scripts/99-run.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env bashio
 
 # Autodefine if not defined
diff --git a/bazarr/apparmor.txt b/bazarr/apparmor.txt
index 8878326e4..0b292a08b 100644
--- a/bazarr/apparmor.txt
+++ b/bazarr/apparmor.txt
@@ -1,3 +1,4 @@
+
 #include <tunables/global>
 
 profile bazarr_addon flags=(attach_disconnected,mediate_deleted) {
diff --git a/bazarr/rootfs/etc/cont-init.d/00-ha-env b/bazarr/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from bazarr/rootfs/etc/cont-init.d/00-ha-env
rename to bazarr/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from bazarr/rootfs/etc/cont-init.d/20-folders
rename to bazarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf b/cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf
index 6f1500599..38c56bcc3 100644
--- a/cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf
+++ b/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;
diff --git a/cloudcommander/rootfs/etc/nginx/includes/upstream.conf b/cloudcommander/rootfs/etc/nginx/includes/upstream.conf
index 16b54dd6f..dca5ff5a4 100644
--- a/cloudcommander/rootfs/etc/nginx/includes/upstream.conf
+++ b/cloudcommander/rootfs/etc/nginx/includes/upstream.conf
@@ -1,3 +1,4 @@
+
 upstream backend {
     server 127.0.0.1:8000;
 } 
diff --git a/emby/rootfs/etc/cont-init.d/20-folders b/emby/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from emby/rootfs/etc/cont-init.d/20-folders
rename to emby/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/filebrowser/rootfs/etc/nginx/nginx.conf b/filebrowser/rootfs/etc/nginx/nginx.conf
index 3648d92a2..833c2ad1d 100644
--- a/filebrowser/rootfs/etc/nginx/nginx.conf
+++ b/filebrowser/rootfs/etc/nginx/nginx.conf
@@ -1,3 +1,4 @@
+
 # Run nginx in foreground.
 daemon off;
 
diff --git a/grav/rootfs/etc/cont-init.d/00-ha-env b/grav/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from grav/rootfs/etc/cont-init.d/00-ha-env
rename to grav/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/grav/rootfs/etc/cont-init.d/20-folders b/grav/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from grav/rootfs/etc/cont-init.d/20-folders
rename to grav/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/jackett/rootfs/etc/cont-init.d/20-folders b/jackett/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from jackett/rootfs/etc/cont-init.d/20-folders
rename to jackett/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/jellyfin/rootfs/etc/cont-init.d/00-ha-env b/jellyfin/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from jellyfin/rootfs/etc/cont-init.d/00-ha-env
rename to jellyfin/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from jellyfin/rootfs/etc/cont-init.d/20-folders
rename to jellyfin/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/joal/rootfs/etc/nginx/includes/proxy_params.conf b/joal/rootfs/etc/nginx/includes/proxy_params.conf
index 924ba949e..b9e2e071f 100644
--- a/joal/rootfs/etc/nginx/includes/proxy_params.conf
+++ b/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;
diff --git a/joal/rootfs/etc/nginx/nginx.conf b/joal/rootfs/etc/nginx/nginx.conf
index 3648d92a2..833c2ad1d 100644
--- a/joal/rootfs/etc/nginx/nginx.conf
+++ b/joal/rootfs/etc/nginx/nginx.conf
@@ -1,3 +1,4 @@
+
 # Run nginx in foreground.
 daemon off;
 
diff --git a/joal/rootfs/etc/nginx/servers/ingress.conf b/joal/rootfs/etc/nginx/servers/ingress.conf
index 85582eb81..eac43b228 100644
--- a/joal/rootfs/etc/nginx/servers/ingress.conf
+++ b/joal/rootfs/etc/nginx/servers/ingress.conf
@@ -1,3 +1,4 @@
+
 server {
     listen %%interface%%:%%port%% default_server;
 
diff --git a/lidarr/Readme.md b/lidarr/Readme.md
index 962c803f3..1026d8cc4 100644
--- a/lidarr/Readme.md
+++ b/lidarr/Readme.md
@@ -1,3 +1,4 @@
+
 # Home assistant add-on: Lidarr
 
 [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from lidarr/rootfs/etc/cont-init.d/20-folders
rename to lidarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/10-adduser b/nextcloud/rootfs/etc/cont-init.d/10-adduser.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/10-adduser
rename to nextcloud/rootfs/etc/cont-init.d/10-adduser.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/30-keygen b/nextcloud/rootfs/etc/cont-init.d/30-keygen.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/30-keygen
rename to nextcloud/rootfs/etc/cont-init.d/30-keygen.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/40-config b/nextcloud/rootfs/etc/cont-init.d/40-config.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/40-config
rename to nextcloud/rootfs/etc/cont-init.d/40-config.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/50-install b/nextcloud/rootfs/etc/cont-init.d/50-install.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/50-install
rename to nextcloud/rootfs/etc/cont-init.d/50-install.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/60-memcache b/nextcloud/rootfs/etc/cont-init.d/60-memcache.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/60-memcache
rename to nextcloud/rootfs/etc/cont-init.d/60-memcache.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/99-elasticsearch
rename to nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/99-ocr b/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/99-ocr
rename to nextcloud/rootfs/etc/cont-init.d/99-ocr.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh
similarity index 100%
rename from nextcloud/rootfs/etc/cont-init.d/99-trusted_domains
rename to nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh
diff --git a/organizr/rootfs/etc/cont-init.d/00-folders b/organizr/rootfs/etc/cont-init.d/00-folders.sh
similarity index 100%
rename from organizr/rootfs/etc/cont-init.d/00-folders
rename to organizr/rootfs/etc/cont-init.d/00-folders.sh
diff --git a/papermerge/rootfs/etc/cont-init.d/91-OCR b/papermerge/rootfs/etc/cont-init.d/91-OCR.sh
similarity index 100%
rename from papermerge/rootfs/etc/cont-init.d/91-OCR
rename to papermerge/rootfs/etc/cont-init.d/91-OCR.sh
diff --git a/papermerge/rootfs/etc/cont-init.d/99-configuration b/papermerge/rootfs/etc/cont-init.d/99-configuration.sh
similarity index 100%
rename from papermerge/rootfs/etc/cont-init.d/99-configuration
rename to papermerge/rootfs/etc/cont-init.d/99-configuration.sh
diff --git a/plex/rootfs/etc/cont-init.d/21-folders b/plex/rootfs/etc/cont-init.d/21-folders.sh
similarity index 100%
rename from plex/rootfs/etc/cont-init.d/21-folders
rename to plex/rootfs/etc/cont-init.d/21-folders.sh
diff --git a/plex/rootfs/etc/cont-init.d/90-create_links b/plex/rootfs/etc/cont-init.d/90-create_links.sh
similarity index 100%
rename from plex/rootfs/etc/cont-init.d/90-create_links
rename to plex/rootfs/etc/cont-init.d/90-create_links.sh
diff --git a/portainer/rootfs/etc/services.d/nginx/finish b/portainer/rootfs/etc/services.d/nginx/finish
index 444240135..5704b02f5 100644
--- a/portainer/rootfs/etc/services.d/nginx/finish
+++ b/portainer/rootfs/etc/services.d/nginx/finish
@@ -1,3 +1,4 @@
+
 #!/usr/bin/execlineb -S0
 # ==============================================================================
 # Take down the S6 supervision tree when Nginx fails
diff --git a/prowlarr/rootfs/etc/cont-init.d/00-ha-env b/prowlarr/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from prowlarr/rootfs/etc/cont-init.d/00-ha-env
rename to prowlarr/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from prowlarr/rootfs/etc/cont-init.d/20-folders
rename to prowlarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh b/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
index dd80ef417..d537ca5c5 100644
--- a/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/with-contenv bashio
 
 ###############
diff --git a/radarr/rootfs/etc/cont-init.d/00-ha-env b/radarr/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from radarr/rootfs/etc/cont-init.d/00-ha-env
rename to radarr/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/radarr/rootfs/etc/cont-init.d/20-folders b/radarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from radarr/rootfs/etc/cont-init.d/20-folders
rename to radarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/readarr/rootfs/etc/cont-init.d/00-ha-env b/readarr/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from readarr/rootfs/etc/cont-init.d/00-ha-env
rename to readarr/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/readarr/rootfs/etc/cont-init.d/20-folders b/readarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from readarr/rootfs/etc/cont-init.d/20-folders
rename to readarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/sonarr/rootfs/etc/cont-init.d/00-ha-env b/sonarr/rootfs/etc/cont-init.d/00-ha-env.sh
similarity index 100%
rename from sonarr/rootfs/etc/cont-init.d/00-ha-env
rename to sonarr/rootfs/etc/cont-init.d/00-ha-env.sh
diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
similarity index 100%
rename from sonarr/rootfs/etc/cont-init.d/20-folders
rename to sonarr/rootfs/etc/cont-init.d/20-folders.sh
diff --git a/transmission/rootfs/etc/cont-init.d/20-config b/transmission/rootfs/etc/cont-init.d/20-config.sh
similarity index 100%
rename from transmission/rootfs/etc/cont-init.d/20-config
rename to transmission/rootfs/etc/cont-init.d/20-config.sh
diff --git a/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh b/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
index 0920d68bd..f4f66ef23 100644
--- a/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
+++ b/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/with-contenv bashio
 
 ######################
diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh
index a948f3bbb..04343a705 100644
--- a/webtrees/rootfs/entrypoint.sh
+++ b/webtrees/rootfs/entrypoint.sh
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 
 echo "Starting..."
diff --git a/webtrees/rootfs/scripts/90-config_yaml.sh b/webtrees/rootfs/scripts/90-config_yaml.sh
index 0863cb6e5..25ec801ba 100644
--- a/webtrees/rootfs/scripts/90-config_yaml.sh
+++ b/webtrees/rootfs/scripts/90-config_yaml.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/with-contenv bashio
 
 ##################
diff --git a/zzz_templates/00-aaa_dockerfile_backup.sh b/zzz_templates/00-aaa_dockerfile_backup.sh
index ad7d5b3a3..f6f09edbb 100644
--- a/zzz_templates/00-aaa_dockerfile_backup.sh
+++ b/zzz_templates/00-aaa_dockerfile_backup.sh
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
diff --git a/zzz_templates/00-bettercomments.sh b/zzz_templates/00-bettercomments.sh
index c52e0660e..1dc7328cc 100644
--- a/zzz_templates/00-bettercomments.sh
+++ b/zzz_templates/00-bettercomments.sh
@@ -1,3 +1,4 @@
+
 #!bin/bash
 
 # Color comments

From b9261118a9739b207f4d268b9e6fd2bf684a6ddf Mon Sep 17 00:00:00 2001
From: Bruvv <nvoorn@gmail.com>
Date: Mon, 27 Dec 2021 10:32:55 +0100
Subject: [PATCH 13/48] fixed badge url

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7e3ded9cf..a055141aa 100644
--- a/README.md
+++ b/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
 
 ## &#10003; 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.

From 92305f71109d05e5cb03e4ee6f8b8903075c7676 Mon Sep 17 00:00:00 2001
From: Bruvv <nvoorn@gmail.com>
Date: Mon, 27 Dec 2021 10:40:42 +0100
Subject: [PATCH 14/48] moved config to new location

---
 bazarr/rootfs/etc/cont-init.d/20-folders.sh   | 15 +++++++++++----
 jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 17 ++++++++++++-----
 lidarr/rootfs/etc/cont-init.d/20-folders.sh   | 17 ++++++++++++-----
 prowlarr/rootfs/etc/cont-init.d/20-folders.sh | 15 +++++++++++----
 whoogle/rootfs/scripts/90-config_yaml.sh      | 14 +++++++-------
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
index 73e1f22de..4b8bdb7fb 100644
--- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -12,8 +12,15 @@ if [ ! -d /share/downloads ]; then
   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
+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
\ No newline at end of file
diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
index 9015351ab..ba976d9aa 100644
--- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
+++ b/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
-  echo "Creating link for /jellyfin/config"
-  mkdir -p /config/jellyfin
-  chown -R abc:abc /config/jellyfin
-  ln -s /config/jellyfin /jellyfin/config
+if [ -d /config/jellyfin ]; then
+  echo "Moving to new location /config/addons_config/jellyfin"
+  mkdir -p /config/addons_config/jellyfin
+  chown -R abc:abc /config/addons_config/jellyfin
+  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
diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
index 6e2cb7cce..46557afcd 100644
--- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -12,8 +12,15 @@ if [ ! -d /share/downloads ]; then
   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 
+if [ -d /config/lidarr ]; then
+  echo "Moving to new location /config/addons_config/lidarr"
+  mkdir -p /config/addons_config/lidarr
+  chown -R abc:abc /config/addons_config/lidarr
+  mv /config/lidarr/* /config/addons_config/lidarr/
+fi
+
+if [ ! -d /config/addons_config/lidarr ]; then
+  echo "Creating /config/addons_config/lidarr"
+  mkdir -p /config/addons_config/lidarr
+  chown -R abc:abc /config/addons_config/lidarr
+fi
\ No newline at end of file
diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
index a40d5c92e..642ba3f67 100644
--- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,7 +1,14 @@
 #!/usr/bin/with-contenv bash
 
-if [ ! -d /config/prowlarr ]; then
-  echo "Creating /config/radarr"
-  mkdir -p /config/prowlarr
-  chown -R abc:abc /config/prowlarr
+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
\ No newline at end of file
diff --git a/whoogle/rootfs/scripts/90-config_yaml.sh b/whoogle/rootfs/scripts/90-config_yaml.sh
index 0863cb6e5..148482a8f 100644
--- a/whoogle/rootfs/scripts/90-config_yaml.sh
+++ b/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."
@@ -30,7 +30,7 @@ fi
 
 # Check if yaml is valid
 EXIT_CODE=0
-yamllint -d relaxed --no-warnings $CONFIGSOURCE &>ERROR || EXIT_CODE=$?
+yamllint -d relaxed --no-warnings "$CONFIGSOURCE" &>ERROR || EXIT_CODE=$?
 if [ $EXIT_CODE = 0 ]; then
     echo "Config file is a valid yaml"
 else
@@ -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);
       }
      }'
 }
@@ -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

From 92fabd1942fb24fbfcd2f37085af335c04500071 Mon Sep 17 00:00:00 2001
From: Bruvv <nvoorn@gmail.com>
Date: Mon, 27 Dec 2021 14:08:34 +0100
Subject: [PATCH 15/48] sync

---
 lidarr/rootfs/etc/cont-init.d/20-folders.sh   | 13 ------------
 radarr/rootfs/etc/cont-init.d/00-ha-env.sh    |  2 +-
 .../rootfs/etc/cont-init.d/92-local_mounts.sh | 10 +++++-----
 .../rootfs/etc/cont-init.d/92-smb_mounts.sh   | 20 +++++++++----------
 whoogle/rootfs/scripts/90-config_yaml.sh      |  4 ++--
 5 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
index 46557afcd..c79dc4c13 100644
--- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -11,16 +11,3 @@ if [ ! -d /share/downloads ]; then
   mkdir -p /share/downloads
   chown -R abc:abc /share/downloads
 fi
-
-if [ -d /config/lidarr ]; then
-  echo "Moving to new location /config/addons_config/lidarr"
-  mkdir -p /config/addons_config/lidarr
-  chown -R abc:abc /config/addons_config/lidarr
-  mv /config/lidarr/* /config/addons_config/lidarr/
-fi
-
-if [ ! -d /config/addons_config/lidarr ]; then
-  echo "Creating /config/addons_config/lidarr"
-  mkdir -p /config/addons_config/lidarr
-  chown -R abc:abc /config/addons_config/lidarr
-fi
\ No newline at end of file
diff --git a/radarr/rootfs/etc/cont-init.d/00-ha-env.sh b/radarr/rootfs/etc/cont-init.d/00-ha-env.sh
index d0b511f60..d48e84bd4 100644
--- a/radarr/rootfs/etc/cont-init.d/00-ha-env.sh
+++ b/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
diff --git a/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh b/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh
index 0920d68bd..920edcd60 100644
--- a/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh
+++ b/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
-    chown -R $(id -u):$(id -g) /mnt/$disk
+    mkdir -p /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
 
diff --git a/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh b/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh
index 06410e554..1177e83ce 100644
--- a/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh
+++ b/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
-    chown -R root:root /mnt/$diskname
+    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
+    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
-      rmdir /mnt/$diskname || true
+      umount /mnt/"$diskname" 2>/dev/null || true
+      rmdir /mnt/"$diskname" || true
     fi
 
   done
diff --git a/whoogle/rootfs/scripts/90-config_yaml.sh b/whoogle/rootfs/scripts/90-config_yaml.sh
index 148482a8f..283595d65 100644
--- a/whoogle/rootfs/scripts/90-config_yaml.sh
+++ b/whoogle/rootfs/scripts/90-config_yaml.sh
@@ -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

From 752217b393313280fe15f0d52d8b541716c6c865 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 27 Dec 2021 14:48:33 +0100
Subject: [PATCH 16/48] Update 92-local_mounts.sh

---
 webtop/rootfs/etc/cont-init.d/92-local_mounts.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh b/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
index f4f66ef23..0920d68bd 100644
--- a/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
+++ b/webtop/rootfs/etc/cont-init.d/92-local_mounts.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/with-contenv bashio
 
 ######################

From 9f1f8cf21717aa9116d8fdd8a1cbfda8283acdeb Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 27 Dec 2021 14:48:46 +0100
Subject: [PATCH 17/48] Update entrypoint.sh

---
 webtrees/rootfs/entrypoint.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh
index 04343a705..a948f3bbb 100644
--- a/webtrees/rootfs/entrypoint.sh
+++ b/webtrees/rootfs/entrypoint.sh
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 
 echo "Starting..."

From b0f2e177cdbb580a435bf9bd8df1643bae961b9b Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 27 Dec 2021 14:49:08 +0100
Subject: [PATCH 18/48] Update 00-bettercomments.sh

---
 zzz_templates/00-bettercomments.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zzz_templates/00-bettercomments.sh b/zzz_templates/00-bettercomments.sh
index 1dc7328cc..32acdb462 100644
--- a/zzz_templates/00-bettercomments.sh
+++ b/zzz_templates/00-bettercomments.sh
@@ -1,5 +1,4 @@
-
-#!bin/bash
+#!/bin/bash
 
 # Color comments
 #! Red

From e503a6b0dbd4dba76d59ce5a745492d84d1234b3 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:10:28 +0100
Subject: [PATCH 19/48] remove blank line

---
 arpspoof/rootfs/scripts/99-run.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arpspoof/rootfs/scripts/99-run.sh b/arpspoof/rootfs/scripts/99-run.sh
index a97d9a981..189fe4877 100644
--- a/arpspoof/rootfs/scripts/99-run.sh
+++ b/arpspoof/rootfs/scripts/99-run.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bashio
 
 # Autodefine if not defined

From b1a4b2f4addbfcdb59100dc5100c39b79bf8c339 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:12:48 +0100
Subject: [PATCH 20/48] /config/addons_config/bazarr

---
 bazarr/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index e398eb389..6b02a896c 100644
--- a/bazarr/Dockerfile
+++ b/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/services.d | xargs sed -i 's| /config| /config/bazarr|g' \
-    && sed -i 's=/config/flexget=/config/bazarr || true=g' /etc/cont-init.d/10-adduser \
+    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/addons_config/bazarr|g' \
     \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

From fb22463e718b6099ce5f5e89aa0b084d88b22652 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:13:23 +0100
Subject: [PATCH 21/48] Update CHANGELOG.md

---
 bazarr/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bazarr/CHANGELOG.md b/bazarr/CHANGELOG.md
index d1232be22..ff14e021a 100644
--- a/bazarr/CHANGELOG.md
+++ b/bazarr/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Config location changed to /config/addons_config/bazarr
 - New standardized logic for Dockerfile build and packages installation
 
 ## 1.0.1 (20-11-2021)

From 1cc2697b2af3205cc0c478cdaef06872a6115bb0 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:14:09 +0100
Subject: [PATCH 22/48] Update CHANGELOG.md

---
 cloudcommander/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md
index 791ffbc5a..7bb6d22d5 100644
--- a/cloudcommander/CHANGELOG.md
+++ b/cloudcommander/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Cleanup: config base folder changed to /config/addons_config
 
 ## 15.9.13 (24-12-2021)
 - Update to latest version from coderaiser/cloudcmd

From 797609658872a56bb0238cbc0d4db131a2c17a6c Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:15:41 +0100
Subject: [PATCH 23/48] Update CHANGELOG.md

---
 bazarr/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bazarr/CHANGELOG.md b/bazarr/CHANGELOG.md
index ff14e021a..15ffafed2 100644
--- a/bazarr/CHANGELOG.md
+++ b/bazarr/CHANGELOG.md
@@ -1,4 +1,4 @@
-- Config location changed to /config/addons_config/bazarr
+- Cleanup: config base folder changed to /config/addons_config
 - New standardized logic for Dockerfile build and packages installation
 
 ## 1.0.1 (20-11-2021)

From b393bc9bf30631d6c15f700912b5f7b284398440 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:22:57 +0100
Subject: [PATCH 24/48] Update CHANGELOG.md

---
 cloudcommander/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md
index 7bb6d22d5..791ffbc5a 100644
--- a/cloudcommander/CHANGELOG.md
+++ b/cloudcommander/CHANGELOG.md
@@ -1,4 +1,3 @@
-- Cleanup: config base folder changed to /config/addons_config
 
 ## 15.9.13 (24-12-2021)
 - Update to latest version from coderaiser/cloudcmd

From 614934c405ad4b1f98317f3243487cd973d08c3e Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:32:45 +0100
Subject: [PATCH 26/48] Update Dockerfile

---
 nextcloud/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index b0dd90ead..9f969cf30 100644
--- a/nextcloud/Dockerfile
+++ b/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/* \

From 44442c19b3c157e97bad9f5fd0253203a90e302d Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:37:29 +0100
Subject: [PATCH 27/48] /config/addons_config/prowlarr

---
 prowlarr/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index df2b6a042..26c4ac082 100644
--- a/prowlarr/Dockerfile
+++ b/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=/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|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \    
+    && sed -i 's=	/config=/config/addons_config/prowlarr || true=g' /etc/cont-init.d/30-config \
+    && sed -i 's|/config|/config/addons_config/prowlarr|g' /etc/services.d/prowlarr/run
 
 ##################
 # 3 Install apps #

From da0ccdd06c882df24a23535dc543199eb1b626da Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:37:59 +0100
Subject: [PATCH 28/48] Update 90-dns_set.sh

---
 qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh b/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
index d537ca5c5..dd80ef417 100644
--- a/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/90-dns_set.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/with-contenv bashio
 
 ###############

From 89ec5915c2dbc6772116a14fff2a9313105756d5 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:42:50 +0100
Subject: [PATCH 29/48] /config/addons_config/radarr

---
 radarr/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 94e6beda1..4e85ced3b 100644
--- a/radarr/Dockerfile
+++ b/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/radarr|g" /etc/cont-init.d/30-config \
+    sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \
+    && 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 \

From b85595a46a7cd3e80682d998da407e3642b1b421 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:43:24 +0100
Subject: [PATCH 30/48] Update Dockerfile

---
 readarr/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 0f515b7e1..d2f5a7b5f 100644
--- a/readarr/Dockerfile
+++ b/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 \
-    && sed -i "s|/config|/config/readarr|g" /etc/cont-init.d/30-config \
+RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/readarr/run \
+    && 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 \

From 97c53fa91b16d00ec7c8b6c23ffba710e0600753 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:46:40 +0100
Subject: [PATCH 31/48] not needed

---
 sonarr/rootfs/etc/cont-init.d/00-ha-env.sh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 sonarr/rootfs/etc/cont-init.d/00-ha-env.sh

diff --git a/sonarr/rootfs/etc/cont-init.d/00-ha-env.sh b/sonarr/rootfs/etc/cont-init.d/00-ha-env.sh
deleted file mode 100644
index 3b3e69246..000000000
--- a/sonarr/rootfs/etc/cont-init.d/00-ha-env.sh
+++ /dev/null
@@ -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
\ No newline at end of file

From cee3c57775dbc02cd93267f317fcaeda433c5011 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:47:21 +0100
Subject: [PATCH 32/48] Update Dockerfile

---
 sonarr/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 9bcb45c66..fb3f42ca7 100644
--- a/sonarr/Dockerfile
+++ b/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/sonarr|g" /etc/cont-init.d/30-config \
+    sed -i "s|/config|/config/addons_config/sonarr|g" /etc/services.d/sonarr/run \
+    && 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 \

From deeae62466d80c50704ad06b9a3266f1bd9ec384 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:48:46 +0100
Subject: [PATCH 33/48] remove upstream file

---
 .../rootfs/etc/cont-init.d/{20-config.sh => 19-config.sh}       | 2 ++
 1 file changed, 2 insertions(+)
 rename transmission/rootfs/etc/cont-init.d/{20-config.sh => 19-config.sh} (98%)

diff --git a/transmission/rootfs/etc/cont-init.d/20-config.sh b/transmission/rootfs/etc/cont-init.d/19-config.sh
similarity index 98%
rename from transmission/rootfs/etc/cont-init.d/20-config.sh
rename to transmission/rootfs/etc/cont-init.d/19-config.sh
index f412554a5..9a6a837a7 100644
--- a/transmission/rootfs/etc/cont-init.d/20-config.sh
+++ b/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

From aa9c3bcd75f135ce6163dab696f54ef482639df5 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:49:19 +0100
Subject: [PATCH 34/48] blank link

---
 webtrees/rootfs/scripts/90-config_yaml.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webtrees/rootfs/scripts/90-config_yaml.sh b/webtrees/rootfs/scripts/90-config_yaml.sh
index dfbd34ff0..4ce48c496 100644
--- a/webtrees/rootfs/scripts/90-config_yaml.sh
+++ b/webtrees/rootfs/scripts/90-config_yaml.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/with-contenv bashio
 
 ##################

From bc0858482fc2d1e10af632e270e173407545476e Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:51:40 +0100
Subject: [PATCH 35/48] Update 00-aaa_dockerfile_backup.sh

---
 zzz_templates/00-aaa_dockerfile_backup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zzz_templates/00-aaa_dockerfile_backup.sh b/zzz_templates/00-aaa_dockerfile_backup.sh
index f6f09edbb..ad7d5b3a3 100644
--- a/zzz_templates/00-aaa_dockerfile_backup.sh
+++ b/zzz_templates/00-aaa_dockerfile_backup.sh
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then

From d8c8c4ea565abb87e954d71b993b2e8c8c7540b6 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:53:16 +0100
Subject: [PATCH 36/48] Update CHANGELOG.md

---
 jackett/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md
index 0c094aa40..adbf42e61 100644
--- a/jackett/CHANGELOG.md
+++ b/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

From 3e2e79dfad909f71ec845c9c04c92f0250f66fc3 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:53:47 +0100
Subject: [PATCH 37/48] /config/addons_config

---
 jackett/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index cf15265a9..7e7c447d5 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -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 \
-    && sed -i "s|/config|/config/Jackett|g" /etc/cont-init.d/30-config \
+RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/run \
+    && 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 \

From 3616764e922c5e5132139f41244ac604e9e68d37 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:54:17 +0100
Subject: [PATCH 38/48] Update CHANGELOG.md

---
 jellyfin/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md
index 64152c0a9..f5f99a4a0 100644
--- a/jellyfin/CHANGELOG.md
+++ b/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

From 858e2d0037a96baa59625ab82d8444f53ef351da Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:54:53 +0100
Subject: [PATCH 39/48] Update Dockerfile

---
 jellyfin/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index be9341b7b..4f4094a10 100644
--- a/jellyfin/Dockerfile
+++ b/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/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/services.d/jellyfin/run \
+    && sed -i "s|/config|/config/addons_config/jellyfin|g" /etc/cont-init.d/10-adduser \
+    && sed -i "s|/config|/config/addons_config/jellyfin|g" /etc/cont-init.d/30-config
 
 ##################
 # 3 Install apps #

From df0001b19a60ffdd5ed23da95a28495fb5d367ff Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:55:37 +0100
Subject: [PATCH 40/48] Update CHANGELOG.md

---
 prowlarr/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md
index 122a85def..522384dba 100644
--- a/prowlarr/CHANGELOG.md
+++ b/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

From 0a737541d91660167b745c3c8dc7b61b3697f49d Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:56:00 +0100
Subject: [PATCH 41/48] Update CHANGELOG.md

---
 radarr/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md
index af078aef5..1ddc5b44b 100644
--- a/radarr/CHANGELOG.md
+++ b/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

From 91627b067edd019335d3a0f521dabafbe59ed65f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:56:04 +0100
Subject: [PATCH 42/48] Update CHANGELOG.md

---
 readarr/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md
index 8d6964cc1..48ec508ca 100644
--- a/readarr/CHANGELOG.md
+++ b/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

From f2d432827694cf80b8393c670ab4854250b0fc6b Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:56:23 +0100
Subject: [PATCH 43/48] Update CHANGELOG.md

---
 sonarr/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sonarr/CHANGELOG.md b/sonarr/CHANGELOG.md
index 0e87ee67b..de6e76944 100644
--- a/sonarr/CHANGELOG.md
+++ b/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

From f4b4c9c8fc7cefba9c996ff6995dbb98f742658f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 12:00:50 +0100
Subject: [PATCH 44/48] Update config.json

---
 bazarr/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bazarr/config.json b/bazarr/config.json
index d6a33b75c..8092b23cf 100644
--- a/bazarr/config.json
+++ b/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]"
 }

From 49d7cdef1736a9fa623fe8b2b26eca8326a65364 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 12:19:20 +0100
Subject: [PATCH 45/48] Update config.json

---
 sonarr/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonarr/config.json b/sonarr/config.json
index 08af2e7e2..5ca605335 100644
--- a/sonarr/config.json
+++ b/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]"
 }

From 86775101b2c52accbab1f58b06b24d718f28057e Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 12:19:31 +0100
Subject: [PATCH 46/48] Update config.json

---
 readarr/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readarr/config.json b/readarr/config.json
index 99b34555f..07a8c9c08 100644
--- a/readarr/config.json
+++ b/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]"
 }

From 2e94f52c28bd1973b1e5ccb4aef3095340523284 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 12:19:46 +0100
Subject: [PATCH 47/48] Update config.json

---
 radarr/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radarr/config.json b/radarr/config.json
index b44a9f29d..bfcf85703 100644
--- a/radarr/config.json
+++ b/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]"
 }

From 986e1c69f0edc3d8531b6ad2b13c644f22b6b23f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 29 Dec 2021 12:20:00 +0100
Subject: [PATCH 48/48] Update config.json

---
 prowlarr/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prowlarr/config.json b/prowlarr/config.json
index 3c2631359..7bbd27254 100644
--- a/prowlarr/config.json
+++ b/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]"
 }