Merge pull request #139 from bruvv/whoogle-fix

Updated whoogle + jackett + other stuff

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
-  chmod a+x $SCRIPTS
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
-  /./$SCRIPTS || echo "$SCRIPTS: exiting $?"
+  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
+  chmod a+x "$SCRIPTS"
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true
+  /./"$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
+