From 93b5c6d5963d2c8ead878c41c8c0d013c6256c28 Mon Sep 17 00:00:00 2001 From: bruvv Date: Sun, 2 Jan 2022 10:41:34 +0100 Subject: [PATCH] reverted bin bash and changed folder locations --- bazarr/rootfs/etc/cont-init.d/20-folders.sh | 8 +++++++- emby/rootfs/etc/cont-init.d/20-folders.sh | 18 +++++++++++++----- jackett/rootfs/etc/cont-init.d/20-folders.sh | 2 +- jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 2 +- prowlarr/rootfs/etc/cont-init.d/20-folders.sh | 4 ++-- radarr/rootfs/etc/cont-init.d/20-folders.sh | 8 ++++---- readarr/rootfs/etc/cont-init.d/20-folders.sh | 19 ++++++++++--------- sonarr/rootfs/etc/cont-init.d/20-folders.sh | 12 ++++++------ zzz_templates/00-bettercomments.sh | 2 +- zzz_templates/automatic_packages.sh | 2 +- 10 files changed, 46 insertions(+), 31 deletions(-) diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh index b5a64e91e..ac8d1c7a5 100644 --- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/storage/movies ]; then echo "Creating /share/storage/movies" @@ -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/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh index 7765f925c..17e59c0d6 100644 --- a/emby/rootfs/etc/cont-init.d/20-folders.sh +++ b/emby/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /emby ]; then echo "Creating /emby" @@ -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/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh index 187bfc32f..f4d27377c 100644 --- a/jackett/rootfs/etc/cont-init.d/20-folders.sh +++ b/jackett/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/downloads ]; then echo "Creating /share/downloads" diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh index 1d8c2904c..877cd36e9 100644 --- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh +++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /jellyfin ]; then echo "Creating /jellyfin" diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh index 5fdccc325..10a5bdc48 100644 --- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,6 +1,6 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash -if [ -d /config/prowlarr ]; then +if [ -d /config/prowlarr ] && [ ! -d /config/addons_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 diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh index 79f3df9e7..f497e47b3 100644 --- a/radarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/storage/movies ]; then echo "Creating /share/storage/movies" @@ -12,15 +12,15 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ ! -d /config/addons_config/radarr ]; then -if [ -d /config/radarr ]; then +if [ -d /config/radarr ] && [ ! -d /config/addons_config/radarr ]; then echo "Moving to new location /config/addons_config/radarr" 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 echo "Creating /config/addons_config/radarr" mkdir -p /config/addons_config/radarr chown -R abc:abc /config/addons_config/radarr diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh index 54a9a8d81..ee243a46c 100644 --- a/readarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash -if [ ! -d /share/music ]; then - echo "Creating /share/music" - mkdir -p /share/music - chown -R abc:abc /share/music +if [ ! -d /share/storage/ebook ]; then + echo "Creating /share/storage/ebook" + mkdir -p /share/storage/ebook + chown -R abc:abc /share/storage/ebook fi if [ ! -d /share/downloads ]; then @@ -12,15 +12,16 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ ! -d /config/addons_config/readarr ]; then -if [ -d /config/readarr ]; then +if [ -d /config/readarr ] && [ ! -d /config/addons_config/readarr ]; then echo "Moving to new location /config/addons_config/readarr" 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 - echo "Creating /config/addons_config/readarr" +fi + +if [ ! -d /config/addons_config/readarr ]; then + echo "Creating /config/addons_config/readarr" mkdir -p /config/addons_config/readarr chown -R abc:abc /config/addons_config/readarr fi diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh index f2c586c1b..36f96c5ed 100644 --- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio +#!/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 +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 @@ -12,7 +12,7 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ -d /config/sonarr ]; then +if [ -d /config/sonarr ] && [ ! -d /config/addons_config/sonarr ]; then echo "Moving to new location /config/addons_config/sonarr" mkdir -p /config/addons_config/sonarr chown -R abc:abc /config/addons_config/sonarr diff --git a/zzz_templates/00-bettercomments.sh b/zzz_templates/00-bettercomments.sh index b31a742fa..32acdb462 100644 --- a/zzz_templates/00-bettercomments.sh +++ b/zzz_templates/00-bettercomments.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash # Color comments #! Red diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh index 8c3d67582..d7c66640b 100644 --- a/zzz_templates/automatic_packages.sh +++ b/zzz_templates/automatic_packages.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ######## # INIT #