From 14a7d6c36a01587914ae7b321480dcb9060b33ae Mon Sep 17 00:00:00 2001 From: GilbN <24592972+GilbN@users.noreply.github.com> Date: Tue, 18 Jul 2023 20:17:56 +0200 Subject: [PATCH 1/3] Servarr: Docker mods - Inject link tag into body instead of head. --- docker-mods/lidarr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ .../prowlarr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ docker-mods/radarr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ docker-mods/sonarr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark index c27cd010cb..d782d34530 100755 --- a/docker-mods/lidarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/lidarr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/
/ /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 0b1471c20f..140834376d 100755 --- a/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/lidarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark index 24aa5eca15..537108d8f9 100755 --- a/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/prowlarr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 37afbbbd39..bd68c4a9c0 100755 --- a/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/prowlarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/radarr/root/etc/cont-init.d/98-themepark b/docker-mods/radarr/root/etc/cont-init.d/98-themepark index 6c4e634dff..2945c94953 100755 --- a/docker-mods/radarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/radarr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 4051c1fdf5..bc39ae49d2 100755 --- a/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/radarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark index 31c35abc23..501578f2f4 100755 --- a/docker-mods/sonarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/sonarr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 636eb2ae4c..a854a5107c 100755 --- a/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/sonarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi From 51b91bdbd55129dac341ba6dd2d034ec5a339747 Mon Sep 17 00:00:00 2001 From: GilbN <24592972+GilbN@users.noreply.github.com> Date: Tue, 18 Jul 2023 20:47:59 +0200 Subject: [PATCH 2/3] Tautulli: Fix for dashboard stats background. --- css/base/tautulli/tautulli-base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base/tautulli/tautulli-base.css b/css/base/tautulli/tautulli-base.css index 9c8b78bd2a..4a4f89ca08 100644 --- a/css/base/tautulli/tautulli-base.css +++ b/css/base/tautulli/tautulli-base.css @@ -206,7 +206,7 @@ select, .dashboard-stats-background, .dashboard-activity-background, .dashboard-activity-poster-container { - background: var(--transparency-dark-25); + background-color: var(--transparency-dark-25); } .dashboard-activity-progress-bar { From 62fa7849e8b0327a62ab5964395546ad281171f4 Mon Sep 17 00:00:00 2001 From: GilbN <24592972+GilbN@users.noreply.github.com> Date: Sat, 22 Jul 2023 19:01:33 +0200 Subject: [PATCH 3/3] Update readarr and whisparr mods --- .../readarr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ .../whisparr/root/etc/cont-init.d/98-themepark | 12 ++++++------ .../etc/s6-overlay/s6-rc.d/init-mod-themepark/run | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docker-mods/readarr/root/etc/cont-init.d/98-themepark b/docker-mods/readarr/root/etc/cont-init.d/98-themepark index 1918574025..00e30314cf 100755 --- a/docker-mods/readarr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/readarr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/// /g" "${APP_FILEPATH}" + sed -i "s/// /g" "${APP_FILEPATH}" + sed -i "s/// /g" "${LOGIN_FILEPATH}" + sed -i "s/// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/// /g" "${APP_FILEPATH}" + sed -i "s/// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 28f2b78d1d..19ac27f249 100755 --- a/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/readarr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s/// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark index 38dacbeb42..c8ab5aa836 100755 --- a/docker-mods/whisparr/root/etc/cont-init.d/98-themepark +++ b/docker-mods/whisparr/root/etc/cont-init.d/98-themepark @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi diff --git a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run index 8f710aaaa6..1647b4f2a6 100755 --- a/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run +++ b/docker-mods/whisparr/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run @@ -52,15 +52,15 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then echo '---------------------------' echo '| Adding the stylesheet |' echo '---------------------------' - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Stylesheet set to %s\n' "${TP_THEME}" if [[ -n ${TP_ADDON} ]]; then for addon in $(echo "$TP_ADDON" | tr "|" " "); do - sed -i "s/<\/head>/<\/head> /g" "${APP_FILEPATH}" - sed -i "s/<\/head>/<\/head> /g" "${LOGIN_FILEPATH}" + sed -i "s// /g" "${APP_FILEPATH}" + sed -i "s// /g" "${LOGIN_FILEPATH}" printf 'Added custom addon: %s\n\n' "${addon}" done fi