From 92305f71109d05e5cb03e4ee6f8b8903075c7676 Mon Sep 17 00:00:00 2001 From: Bruvv Date: Mon, 27 Dec 2021 10:40:42 +0100 Subject: [PATCH] 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/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