diff --git a/.github/.gitattributes b/.github/.gitattributes new file mode 100644 index 000000000..93c0e783b --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/addons_updater/rootfs/entrypoint.sh b/addons_updater/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/addons_updater/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/arpspoof/rootfs/entrypoint.sh b/arpspoof/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/arpspoof/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh b/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/arpspoof/rootfs/scripts/00-global_var.sh b/arpspoof/rootfs/scripts/00-global_var.sh index e88ad363a..b68e3f08b 100644 --- a/arpspoof/rootfs/scripts/00-global_var.sh +++ b/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 + diff --git a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh index 2e9e0988e..ac8d1c7a5 100644 --- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/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 diff --git a/bitwarden/icon.png b/bitwarden/icon.png index 9b85cc1dd..ff53d9e0b 100644 Binary files a/bitwarden/icon.png and b/bitwarden/icon.png differ diff --git a/bitwarden/logo.png b/bitwarden/logo.png index 9b85cc1dd..ff53d9e0b 100644 Binary files a/bitwarden/logo.png and b/bitwarden/logo.png differ diff --git a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/booksonic_air/icon.png b/booksonic_air/icon.png index 4232ac91a..61fbd35c1 100644 Binary files a/booksonic_air/icon.png and b/booksonic_air/icon.png differ diff --git a/booksonic_air/logo.png b/booksonic_air/logo.png index 4232ac91a..61fbd35c1 100644 Binary files a/booksonic_air/logo.png and b/booksonic_air/logo.png differ diff --git a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/cloudcommander/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/code-server/icon.png b/code-server/icon.png index c844135a8..005c499c5 100644 Binary files a/code-server/icon.png and b/code-server/icon.png differ diff --git a/code-server/logo.png b/code-server/logo.png index c844135a8..9715891b1 100644 Binary files a/code-server/logo.png and b/code-server/logo.png differ diff --git a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh index 516f4f95f..17e59c0d6 100644 --- a/emby/rootfs/etc/cont-init.d/20-folders.sh +++ b/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 - echo "Creating /config/emby" - mkdir -p /config/emby - chown -R abc:abc /config/emby +if [ -d /config/emby ] && [ ! -d /config/addons_config/emby ]; then + echo "Moving to new location /config/addons_config/emby" + mkdir -p /config/addons_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 diff --git a/enedisgateway2mqtt/icon.png b/enedisgateway2mqtt/icon.png index 80e452aaa..a7bce3e35 100644 Binary files a/enedisgateway2mqtt/icon.png and b/enedisgateway2mqtt/icon.png differ diff --git a/enedisgateway2mqtt/logo.png b/enedisgateway2mqtt/logo.png index 80e452aaa..585cd198d 100644 Binary files a/enedisgateway2mqtt/logo.png and b/enedisgateway2mqtt/logo.png differ diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/enedisgateway2mqtt/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/enedisgateway2mqtt_dev/icon.png b/enedisgateway2mqtt_dev/icon.png index 80e452aaa..9db19d5ff 100644 Binary files a/enedisgateway2mqtt_dev/icon.png and b/enedisgateway2mqtt_dev/icon.png differ diff --git a/enedisgateway2mqtt_dev/logo.png b/enedisgateway2mqtt_dev/logo.png index 80e452aaa..b93d4a450 100644 Binary files a/enedisgateway2mqtt_dev/logo.png and b/enedisgateway2mqtt_dev/logo.png differ diff --git a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh index a948f3bbb..4962844d8 100644 --- a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh +++ b/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 - chmod a+x $SCRIPTS - sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true - /./$SCRIPTS || echo "$SCRIPTS: exiting $?" -done + 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 \ No newline at end of file diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh index e88ad363a..b68e3f08b 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh +++ b/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 + diff --git a/filebrowser/icon.png b/filebrowser/icon.png index 40d673f69..55007c7cd 100644 Binary files a/filebrowser/icon.png and b/filebrowser/icon.png differ diff --git a/filebrowser/logo.png b/filebrowser/logo.png index 40d673f69..55007c7cd 100644 Binary files a/filebrowser/logo.png and b/filebrowser/logo.png differ diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/filebrowser/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/filebrowser/rootfs/scripts/20-folders.sh b/filebrowser/rootfs/scripts/20-folders.sh index fb5fa8f0a..418a66a1f 100644 --- a/filebrowser/rootfs/scripts/20-folders.sh +++ b/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" diff --git a/fireflyiii/icon.png b/fireflyiii/icon.png index d5ab2f246..4844dd46c 100644 Binary files a/fireflyiii/icon.png and b/fireflyiii/icon.png differ diff --git a/fireflyiii/logo.png b/fireflyiii/logo.png index d5ab2f246..4844dd46c 100644 Binary files a/fireflyiii/logo.png and b/fireflyiii/logo.png differ diff --git a/fireflyiii/rootfs/entrypoint.sh b/fireflyiii/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/fireflyiii/rootfs/entrypoint.sh +++ b/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 diff --git a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/fireflyiii/rootfs/scripts/00-global_var.sh b/fireflyiii/rootfs/scripts/00-global_var.sh index e88ad363a..b68e3f08b 100644 --- a/fireflyiii/rootfs/scripts/00-global_var.sh +++ b/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 + diff --git a/fireflyiii_data_importer/icon.png b/fireflyiii_data_importer/icon.png index ec3fa0f1f..6d0ce2750 100644 Binary files a/fireflyiii_data_importer/icon.png and b/fireflyiii_data_importer/icon.png differ diff --git a/fireflyiii_data_importer/logo.png b/fireflyiii_data_importer/logo.png index ec3fa0f1f..6d0ce2750 100644 Binary files a/fireflyiii_data_importer/logo.png and b/fireflyiii_data_importer/logo.png differ diff --git a/fireflyiii_data_importer/rootfs/entrypoint.sh b/fireflyiii_data_importer/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/fireflyiii_data_importer/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh index e88ad363a..b68e3f08b 100644 --- a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh +++ b/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 + diff --git a/flaresolverr/icon.png b/flaresolverr/icon.png index 23a616fd0..c6c309911 100644 Binary files a/flaresolverr/icon.png and b/flaresolverr/icon.png differ diff --git a/flaresolverr/logo.png b/flaresolverr/logo.png index 23a616fd0..c6c309911 100644 Binary files a/flaresolverr/logo.png and b/flaresolverr/logo.png differ diff --git a/flaresolverr/rootfs/entrypoint.sh b/flaresolverr/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/flaresolverr/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh b/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/flexget/icon.png b/flexget/icon.png index 802ff8ded..3fe3678f6 100644 Binary files a/flexget/icon.png and b/flexget/icon.png differ diff --git a/flexget/logo.png b/flexget/logo.png index 802ff8ded..3fe3678f6 100644 Binary files a/flexget/logo.png and b/flexget/logo.png differ diff --git a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/flexget/rootfs/etc/cont-init.d/00-folders.sh b/flexget/rootfs/etc/cont-init.d/00-folders.sh index b8afdb5f3..7ee499d8b 100644 --- a/flexget/rootfs/etc/cont-init.d/00-folders.sh +++ b/flexget/rootfs/etc/cont-init.d/00-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio slug=flexget diff --git a/gazpar2mqtt/rootfs/entrypoint.sh b/gazpar2mqtt/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/gazpar2mqtt/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/grav/icon.png b/grav/icon.png index 10a768ac0..84a98314a 100644 Binary files a/grav/icon.png and b/grav/icon.png differ diff --git a/grav/logo.png b/grav/logo.png index 10a768ac0..84a98314a 100644 Binary files a/grav/logo.png and b/grav/logo.png differ diff --git a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/inadyn/rootfs/entrypoint.sh b/inadyn/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/inadyn/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh b/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 2179b0ecd..04d141a65 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,5 +1,4 @@ - -## 0.20.216 (01-01-2022) +## 0.20.222 (01-01-2022) - Update to latest version from linuxserver/docker-jackett - Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 64637f8fa..665afdbd2 100644 --- a/jackett/Dockerfile +++ b/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 \ - && sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ +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 \ @@ -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" \ - XDG_CONFIG_HOME="/config/addons_config" +ENV XDG_CONFIG_HOME="/config/addons_config" ################## # 3 Install apps # diff --git a/jackett/config.json b/jackett/config.json index 056b1d703..187c3f997 100644 --- a/jackett/config.json +++ b/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]" + } } diff --git a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh index f636ada12..f4d27377c 100644 --- a/jackett/rootfs/etc/cont-init.d/20-folders.sh +++ b/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 diff --git a/jackett/rootfs/etc/cont-init.d/92-smb_mounts.sh b/jackett/rootfs/etc/cont-init.d/92-smb_mounts.sh index 06410e554..810599c2d 100644 --- a/jackett/rootfs/etc/cont-init.d/92-smb_mounts.sh +++ b/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 - 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 : $(/dev/null || true - rmdir /mnt/$diskname || true + umount /mnt/"$diskname" 2>/dev/null || true + rmdir /mnt/"$diskname" || true fi done diff --git a/jellyfin/icon.png b/jellyfin/icon.png index c0bc82605..1334c6b1e 100644 Binary files a/jellyfin/icon.png and b/jellyfin/icon.png differ diff --git a/jellyfin/logo.png b/jellyfin/logo.png index c0bc82605..f4c9c25a7 100644 Binary files a/jellyfin/logo.png and b/jellyfin/logo.png differ diff --git a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/joal/icon.png b/joal/icon.png index 2e7a3dc24..73f791c97 100644 Binary files a/joal/icon.png and b/joal/icon.png differ diff --git a/joal/logo.png b/joal/logo.png index 2e7a3dc24..73f791c97 100644 Binary files a/joal/logo.png and b/joal/logo.png differ diff --git a/joal/rootfs/entrypoint.sh b/joal/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/joal/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/joplin/rootfs/entrypoint.sh b/joplin/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/joplin/rootfs/entrypoint.sh +++ b/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 - 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 diff --git a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/joplin/rootfs/scripts/00-global_var.sh b/joplin/rootfs/scripts/00-global_var.sh index e88ad363a..b68e3f08b 100644 --- a/joplin/rootfs/scripts/00-global_var.sh +++ b/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 + diff --git a/lidarr/icon.png b/lidarr/icon.png index 9371ceca8..695c5c088 100644 Binary files a/lidarr/icon.png and b/lidarr/icon.png differ diff --git a/lidarr/logo.png b/lidarr/logo.png index 9371ceca8..695c5c088 100644 Binary files a/lidarr/logo.png and b/lidarr/logo.png differ diff --git a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh index 783a9dbd8..971aab507 100644 --- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/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" diff --git a/mealie/icon.png b/mealie/icon.png index 0ca99249e..136b39515 100644 Binary files a/mealie/icon.png and b/mealie/icon.png differ diff --git a/mealie/logo.png b/mealie/logo.png index 0ca99249e..cf2a90906 100644 Binary files a/mealie/logo.png and b/mealie/logo.png differ diff --git a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/nzbget/icon.png b/nzbget/icon.png index 8f1166d55..2fb81343f 100644 Binary files a/nzbget/icon.png and b/nzbget/icon.png differ diff --git a/nzbget/logo.png b/nzbget/logo.png index 8f1166d55..7c349ddff 100644 Binary files a/nzbget/logo.png and b/nzbget/logo.png differ diff --git a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/nzbget/rootfs/etc/cont-init.d/20-folders.sh b/nzbget/rootfs/etc/cont-init.d/20-folders.sh index 1927a8a6d..abd174d25 100644 --- a/nzbget/rootfs/etc/cont-init.d/20-folders.sh +++ b/nzbget/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio slug=nzbget diff --git a/ombi/icon.png b/ombi/icon.png index da16e990d..7632e1364 100644 Binary files a/ombi/icon.png and b/ombi/icon.png differ diff --git a/ombi/logo.png b/ombi/logo.png index da16e990d..bc548e24c 100644 Binary files a/ombi/logo.png and b/ombi/logo.png differ diff --git a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/ombi/rootfs/etc/cont-init.d/20-folders.sh b/ombi/rootfs/etc/cont-init.d/20-folders.sh index a98cd9f36..ee21b5fa8 100644 --- a/ombi/rootfs/etc/cont-init.d/20-folders.sh +++ b/ombi/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio slug=ombi diff --git a/organizr/icon.png b/organizr/icon.png index fa6102b60..015222249 100644 Binary files a/organizr/icon.png and b/organizr/icon.png differ diff --git a/organizr/logo.png b/organizr/logo.png index fa6102b60..f41166f02 100644 Binary files a/organizr/logo.png and b/organizr/logo.png differ diff --git a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/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" diff --git a/organizr/rootfs/etc/cont-init.d/00-folders.sh b/organizr/rootfs/etc/cont-init.d/00-folders.sh index 1bfa6a464..bcbf8ac5a 100644 --- a/organizr/rootfs/etc/cont-init.d/00-folders.sh +++ b/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" diff --git a/paperless_ng/icon.png b/paperless_ng/icon.png index e62b75377..daa6b2a73 100644 Binary files a/paperless_ng/icon.png and b/paperless_ng/icon.png differ diff --git a/paperless_ng/logo.png b/paperless_ng/logo.png index e62b75377..daa6b2a73 100644 Binary files a/paperless_ng/logo.png and b/paperless_ng/logo.png differ diff --git a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/paperless_ng/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" diff --git a/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh b/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh index 081dbf131..954fd57d9 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh +++ b/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio slug=paperless diff --git a/paperless_ng/rootfs/etc/cont-init.d/91-pikepdf.sh b/paperless_ng/rootfs/etc/cont-init.d/91-pikepdf.sh index be55077d3..49f9134a7 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/91-pikepdf.sh +++ b/paperless_ng/rootfs/etc/cont-init.d/91-pikepdf.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio echo "Installing pikepdf..." ( diff --git a/papermerge/icon.png b/papermerge/icon.png index 89a4a1d91..d4d395e4f 100644 Binary files a/papermerge/icon.png and b/papermerge/icon.png differ diff --git a/papermerge/logo.png b/papermerge/logo.png index 89a4a1d91..d4d395e4f 100644 Binary files a/papermerge/logo.png and b/papermerge/logo.png differ diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/papermerge/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" diff --git a/photoprism/rootfs/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/00-aaa_dockerfile_backup.sh index 612e26d7e..17aecfa6e 100644 --- a/photoprism/rootfs/00-aaa_dockerfile_backup.sh +++ b/photoprism/rootfs/00-aaa_dockerfile_backup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" diff --git a/photoprism/rootfs/entrypoint.sh b/photoprism/rootfs/entrypoint.sh index a948f3bbb..0a4d34c5f 100644 --- a/photoprism/rootfs/entrypoint.sh +++ b/photoprism/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 diff --git a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/photoprism/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" diff --git a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/piwigo/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" diff --git a/piwigo/rootfs/etc/cont-init.d/41-folders.sh b/piwigo/rootfs/etc/cont-init.d/41-folders.sh index ca44483bd..fd8944ae4 100644 --- a/piwigo/rootfs/etc/cont-init.d/41-folders.sh +++ b/piwigo/rootfs/etc/cont-init.d/41-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################## # SYMLINK CONFIG # diff --git a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/plex/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" diff --git a/plex/rootfs/etc/cont-init.d/21-folders.sh b/plex/rootfs/etc/cont-init.d/21-folders.sh index d4cbec12d..d1b8873ed 100644 --- a/plex/rootfs/etc/cont-init.d/21-folders.sh +++ b/plex/rootfs/etc/cont-init.d/21-folders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################## # SYMLINK CONFIG # diff --git a/portainer/icon.png b/portainer/icon.png index 59c825257..ac9f743b1 100644 Binary files a/portainer/icon.png and b/portainer/icon.png differ diff --git a/portainer/logo.png b/portainer/logo.png index 59c825257..ac9f743b1 100644 Binary files a/portainer/logo.png and b/portainer/logo.png differ diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 4f9ed9c51..1a3fd0934 100644 --- a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/portainer/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" diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh index fcb55887f..1568ae134 100644 --- a/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh +++ b/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio if [ -e "/PORTFILE" ]; then echo "Installing portainer..." BUILD_UPSTREAM=$(/`) | +| WHOOGLE_CONFIG_STYLE | The custom CSS to use for styling (should be single line) | + +## Usage +Same as most search engines, with the exception of filtering by time range. + +To filter by a range of time, append ":past