Merge pull request #139 from bruvv/whoogle-fix

Updated whoogle + jackett + other stuff

.github/.gitattributes

@@ -0,0 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

addons_updater/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

arpspoof/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

arpspoof/rootfs/scripts/00-global_var.sh

@@ -10,9 +10,9 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
+  VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
@@ -26,8 +26,9 @@ done
 # Set timezone #
 ################
 if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
+  if [ -f /usr/share/zoneinfo/"$TZ" ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
+    ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
+

bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -6,6 +6,12 @@ if [ ! -d /share/storage/movies ]; then
   chown -R abc:abc /share/storage/movies
 fi
 
+if [ ! -d /share/storage/tv ]; then
+  echo "Creating /share/storage/tv"
+  mkdir -p /share/storage/tv
+  chown -R abc:abc /share/storage/tv
+fi
+
 if [ ! -d /share/downloads ]; then
   echo "Creating /share/downloads"
   mkdir -p /share/downloads

bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

cloudcommander/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -24,10 +24,18 @@ if [ ! -d /share/emby ]; then
   chown -R abc:abc /share/emby
 fi
 
-if [ ! -d /config/emby ]; then
+if [ -d /config/emby ] && [ ! -d /config/addons_config/emby ]; then
-  echo "Creating /config/emby"
+  echo "Moving to new location /config/addons_config/emby"
-  mkdir -p /config/emby
+  mkdir -p /config/addons_config/emby
-  chown -R abc:abc /config/emby
+  chown -R abc:abc /config/addons_config/emby
+  mv /config/emby/* /config/addons_config/emby/
+  rm -r /config/emby
+fi
+
+if [ ! -d /config/addons_config/emby ]; then
+  echo "Creating /config/addons_config/emby"
+  mkdir -p /config/addons_config/emby
+  chown -R abc:abc /config/addons_config/emby
 fi
 
 # links

enedisgateway2mqtt/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

enedisgateway2mqtt_dev/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
-done
+done

enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh

@@ -10,9 +10,9 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
+  VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
@@ -26,8 +26,9 @@ done
 # Set timezone #
 ################
 if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
+  if [ -f /usr/share/zoneinfo/"$TZ" ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
+    ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
+

filebrowser/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

filebrowser/rootfs/scripts/20-folders.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 if [ -d /config/filebrowser ]; then
   echo "Moving to new location /config/addons_config/filebrowser"

fireflyiii/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

fireflyiii/rootfs/scripts/00-global_var.sh

@@ -10,9 +10,9 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
+  VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
@@ -26,8 +26,9 @@ done
 # Set timezone #
 ################
 if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
+  if [ -f /usr/share/zoneinfo/"$TZ" ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
+    ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
+

fireflyiii_data_importer/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

fireflyiii_data_importer/rootfs/scripts/00-global_var.sh

@@ -10,9 +10,9 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
+  VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
@@ -26,8 +26,9 @@ done
 # Set timezone #
 ################
 if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
+  if [ -f /usr/share/zoneinfo/"$TZ" ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
+    ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
+

flaresolverr/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

flexget/rootfs/etc/cont-init.d/00-folders.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 slug=flexget
 

gazpar2mqtt/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

inadyn/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

jackett/CHANGELOG.md

@@ -1,5 +1,4 @@
-
+## 0.20.222 (01-01-2022)
-## 0.20.216 (01-01-2022)
 - Update to latest version from linuxserver/docker-jackett
 - Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
 

jackett/Dockerfile

@@ -22,8 +22,7 @@ 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 \
+RUN sed -i "s|/config|/config/addons_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 \
@@ -31,8 +30,7 @@ RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/services.d/jackett/r
     && 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" \
+ENV XDG_CONFIG_HOME="/config/addons_config"
-    XDG_CONFIG_HOME="/config/addons_config"
 
 ##################
 # 3 Install apps #

jackett/config.json

@@ -1,4 +1,10 @@
-{
+{  
+  "name": "Jackett NAS",
+  "version": "0.20.222",
+  "slug": "jackett_nas",
+  "description": "translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software",
+  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett",
+  "apparmor": true,
   "arch": [
     "aarch64",
     "amd64",
@@ -6,7 +12,9 @@
     "armhf"
   ],
   "boot": "auto",
-  "description": "translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software",
+  "upstream": "0.20.222",
+  "startup": "services",
+  "webui": "http://[HOST]:[PORT:9117]",
   "environment": {
     "PUID": "0",
     "PGID": "0"
@@ -17,7 +25,6 @@
     "media:rw",
     "ssl"
   ],
-  "name": "Jackett NAS",
   "options": {
     "PUID": 0,
     "PGID": 0
@@ -40,11 +47,5 @@
     "networkdisks": "str?",
     "cifsusername": "str?",
     "cifspassword": "str?"
-  },
+  }
-  "slug": "jackett_nas",
-  "startup": "services",
-  "upstream": "0.20.216",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "0.20.216-2",
-  "webui": "http://[HOST]:[PORT:9117]"
 }

jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -1,11 +1,5 @@
 #!/bin/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
@@ -18,6 +12,7 @@ if [ -d /config/Jackett ] && [ ! -d /config/addons_config/Jackett ]; then
   chown -R abc:abc /config/addons_config/Jackett
   mv /config/Jackett/* /config/addons_config/Jackett/
   rm -r /config/Jackett
+  rm -r /config/jackett
 fi
 
 if [ ! -d /config/addons_config/Jackett ]; then

jackett/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

jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

joal/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

joal/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

joplin/rootfs/entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Starting..."
 
 ####################
@@ -9,8 +8,8 @@ echo "Starting..."
 for SCRIPTS in /scripts/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
-  chown $(id -u):$(id -g) $SCRIPTS
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x $SCRIPTS
+  chmod a+x "$SCRIPTS"
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

joplin/rootfs/scripts/00-global_var.sh

@@ -10,9 +10,9 @@ JSONSOURCE="/data/options.json"
 # Export keys as env variables
 # echo "All addon options were exported as variables"
 mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
+for KEYS in "${arr[@]}"; do
   # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
+  VALUE=$(jq ."$KEYS" ${JSONSOURCE})
   line="${KEYS}=${VALUE//[\"\']/}"
   # Use locally
   if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
@@ -26,8 +26,9 @@ done
 # Set timezone #
 ################
 if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
+  if [ -f /usr/share/zoneinfo/"$TZ" ]; then
     echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
+    ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
+

lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 if [ ! -d /share/music ]; then
   echo "Creating /share/music"

mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 slug=nzbget
 

ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 slug=ombi
 

organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 # If dockerfile failed install manually
 if [ -e "/ENVFILE" ]; then
     echo "Executing script"

organizr/rootfs/etc/cont-init.d/00-folders.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
 if [ ! -d /data/organizr ]; then
   echo "Creating /data/organizr"