From 78ee22a4564753e4c643f1b08d8eb8d0976a4412 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 29 Dec 2021 16:57:58 +0100 Subject: [PATCH] Remove config directory after moving contents --- bazarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + filebrowser/rootfs/scripts/20-folders.sh | 1 + flexget/rootfs/etc/cont-init.d/00-folders.sh | 1 + jackett/rootfs/etc/cont-init.d/20-folders.sh | 3 ++- jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 2 ++ lidarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + nzbget/rootfs/etc/cont-init.d/20-folders.sh | 1 + ombi/rootfs/etc/cont-init.d/20-folders.sh | 1 + paperless_ng/rootfs/etc/cont-init.d/20-folders.sh | 1 + prowlarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + radarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + readarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + sonarr/rootfs/etc/cont-init.d/20-folders.sh | 1 + ubooquity/rootfs/etc/cont-init.d/20-folders.sh | 1 + 14 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh index 0c9c7f6bb..bfae5ef18 100644 --- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh @@ -17,6 +17,7 @@ if [ -d /config/bazarr ]; then mkdir -p /config/addons_config/bazarr chown -R abc:abc /config/addons_config/bazarr mv /config/bazarr/* /config/addons_config/bazarr/ + rm -r /config/bazarr fi if [ ! -d /config/addons_config/bazarr ]; then diff --git a/filebrowser/rootfs/scripts/20-folders.sh b/filebrowser/rootfs/scripts/20-folders.sh index 2f1a3179c..fb5fa8f0a 100644 --- a/filebrowser/rootfs/scripts/20-folders.sh +++ b/filebrowser/rootfs/scripts/20-folders.sh @@ -5,6 +5,7 @@ if [ -d /config/filebrowser ]; then mkdir -p /config/addons_config/filebrowser chmod 777 /config/addons_config/filebrowser mv /config/filebrowser/* /config/addons_config/filebrowser/ + rm -r /config/filebrowser fi if [ ! -d /config/addons_config/filebrowser ]; then diff --git a/flexget/rootfs/etc/cont-init.d/00-folders.sh b/flexget/rootfs/etc/cont-init.d/00-folders.sh index dfdd331ae..b8afdb5f3 100644 --- a/flexget/rootfs/etc/cont-init.d/00-folders.sh +++ b/flexget/rootfs/etc/cont-init.d/00-folders.sh @@ -7,6 +7,7 @@ if [ -d /config/$slug ]; then mkdir -p /config/addons_config/$slug chmod 777 /config/addons_config/$slug mv /config/$slug/* /config/addons_config/$slug/ + rm -r /config/$slug fi if [ ! -d /config/addons_config/$slug ]; then diff --git a/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh index ed18e27fa..1648b9973 100644 --- a/jackett/rootfs/etc/cont-init.d/20-folders.sh +++ b/jackett/rootfs/etc/cont-init.d/20-folders.sh @@ -16,7 +16,8 @@ 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/ + mv /config/Jackett/* /config/addons_config/Jackett/ + rm -r /config/Jackett fi if [ ! -d /config/addons_config/Jackett ]; then diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh index 53fdc3c8e..793565fa2 100644 --- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh +++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh @@ -33,11 +33,13 @@ if [ ! -d /jellyfin/cache ]; then ln -s /share/jellyfin/cache /jellyfin/cache fi + 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/ + rm /config/jellyfin fi if [ ! -d /config/addons_config/jellyfin ]; then diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh index 8fe5bc8a5..783a9dbd8 100644 --- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh @@ -17,6 +17,7 @@ if [ -d /config/lidarr ]; then mkdir -p /config/addons_config/lidarr chmod 777 /config/addons_config/lidarr mv /config/lidarr/* /config/addons_config/lidarr/ + rm -r /config/lidarr fi if [ ! -d /config/addons_config/lidarr ]; then diff --git a/nzbget/rootfs/etc/cont-init.d/20-folders.sh b/nzbget/rootfs/etc/cont-init.d/20-folders.sh index 76f6be611..50b1f8746 100644 --- a/nzbget/rootfs/etc/cont-init.d/20-folders.sh +++ b/nzbget/rootfs/etc/cont-init.d/20-folders.sh @@ -7,6 +7,7 @@ if [ -d /config/$slug ]; then mkdir -p /config/addons_config/$slug chmod 777 /config/addons_config/$slug mv /config/$slug/* /config/addons_config/$slug/ + rm -r /config/$slug fi if [ ! -d /config/addons_config/$slug ]; then diff --git a/ombi/rootfs/etc/cont-init.d/20-folders.sh b/ombi/rootfs/etc/cont-init.d/20-folders.sh index a16492aea..f51a74ee4 100644 --- a/ombi/rootfs/etc/cont-init.d/20-folders.sh +++ b/ombi/rootfs/etc/cont-init.d/20-folders.sh @@ -7,6 +7,7 @@ if [ -d /config/$slug ]; then mkdir -p /config/addons_config/$slug chmod 777 /config/addons_config/$slug mv /config/$slug/* /config/addons_config/$slug/ + rm -r /config/$slug fi if [ ! -d /config/addons_config/$slug ]; then 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 2e0adaa71..e0c282581 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh +++ b/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh @@ -7,6 +7,7 @@ if [ -d /config/$slug ]; then mkdir -p /config/addons_config/$slug chmod 777 /config/addons_config/$slug mv /config/$slug/* /config/addons_config/$slug/ + rm -r /config/$slug fi if [ ! -d /config/addons_config/$slug ]; then diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh index 2277ef1ed..71942bb00 100644 --- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh @@ -5,6 +5,7 @@ if [ -d /config/prowlarr ]; then mkdir -p /config/addons_config/prowlarr chown -R abc:abc /config/addons_config/prowlarr mv /config/prowlarr/* /config/addons_config/prowlarr/ + rm -r /config/prowlarr fi if [ ! -d /config/addons_config/prowlarr ]; then diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh index 2c5304bc4..67ac3b3e0 100644 --- a/radarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh @@ -17,6 +17,7 @@ if [ -d /config/radarr ]; then mkdir -p /config/addons_config/radarr chown -R abc:abc /config/addons_config/radarr mv /config/radarr/* /config/addons_config/radarr/ + rm -r /config/radarr fi if [ ! -d /config/addons_config/radarr ]; then diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh index 4b0c919f2..b0e1ec338 100644 --- a/readarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh @@ -17,6 +17,7 @@ if [ -d /config/readarr ]; then mkdir -p /config/addons_config/readarr chown -R abc:abc /config/addons_config/readarr mv /config/readarr/* /config/addons_config/readarr/ + rm -r /config/readarr fi if [ ! -d /config/addons_config/readarr ]; then diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh index bdb39d1f2..fd64d6f6b 100644 --- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh @@ -17,6 +17,7 @@ if [ -d /config/sonarr ]; then mkdir -p /config/addons_config/sonarr chown -R abc:abc /config/addons_config/sonarr mv /config/sonarr/* /config/addons_config/sonarr/ + rm -r /config/sonarr fi if [ ! -d /config/addons_config/sonarr ]; then diff --git a/ubooquity/rootfs/etc/cont-init.d/20-folders.sh b/ubooquity/rootfs/etc/cont-init.d/20-folders.sh index ed56a405a..eb55bc3bb 100644 --- a/ubooquity/rootfs/etc/cont-init.d/20-folders.sh +++ b/ubooquity/rootfs/etc/cont-init.d/20-folders.sh @@ -7,6 +7,7 @@ if [ -d /config/$slug ]; then mkdir -p /config/addons_config/$slug chmod 777 /config/addons_config/$slug mv /config/$slug/* /config/addons_config/$slug/ + rm -r /config/$slug fi if [ ! -d /config/addons_config/$slug ]; then