From 17379ef0770fab07c5c763b67fa57a62fc9dd99f Mon Sep 17 00:00:00 2001 From: RandomNinjaAtk Date: Thu, 11 Jul 2024 16:32:48 +0000 Subject: [PATCH] Bug was fixed upstream, reverting to original file #283 - Should resolve --- radarr/setup.bash | 57 ++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/radarr/setup.bash b/radarr/setup.bash index 4ead44e..90b902d 100644 --- a/radarr/setup.bash +++ b/radarr/setup.bash @@ -15,7 +15,6 @@ apk add -U --update --no-cache \ gcc \ ffmpeg && \ echo "************ install python packages ************" && \ -pip install --upgrade pip==24.1 && \ pip install --upgrade --no-cache-dir -U --break-system-packages \ excludarr \ yt-dlp \ @@ -24,20 +23,6 @@ echo "************ setup SMA ************" if [ -d "${SMA_PATH}" ]; then rm -rf "${SMA_PATH}" fi -echo "*********SMA WORKAROUND ************" -pip3 install --break-system-packages \ - requests \ - idna \ - requests-cache \ - babelfish \ - tmdbsimple \ - mutagen \ - guessit \ - subliminal \ - python-dateutil \ - stevedore \ - cleanit \ - plexapi echo "************ setup directory ************" && \ mkdir -p ${SMA_PATH} && \ echo "************ download repo ************" && \ @@ -49,20 +34,14 @@ touch ${SMA_PATH}/config/sma.log && \ chgrp users ${SMA_PATH}/config/sma.log && \ chmod g+w ${SMA_PATH}/config/sma.log && \ echo "************ install pip dependencies ************" && \ -python3 -m pip install --break-system-packages --upgrade pip==24.1 && \ -pip3 install --break-system-packages -r ${SMA_PATH}/setup/requirements.txt || true - -echo "************ install qtfaststart ************" && \ -git clone https://github.com/danielgtaylor/qtfaststart.git /tmp/qtfaststart && \ -cd /tmp/qtfaststart && \ -python3 setup.py install - +python3 -m pip install --break-system-packages --upgrade pip && \ +pip3 install --break-system-packages -r ${SMA_PATH}/setup/requirements.txt && \ echo "************ install recyclarr ************" && \ mkdir -p /recyclarr && \ wget "https://github.com/recyclarr/recyclarr/releases/latest/download/recyclarr-linux-musl-x64.tar.xz" -O "/recyclarr/recyclarr.tar.xz" && \ tar -xf /recyclarr/recyclarr.tar.xz -C /recyclarr &>/dev/null && \ -chmod 777 /recyclarr/recyclarr && \ -apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/community dotnet8-runtime +chmod 777 /recyclarr/recyclarr +apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/community dotnet7-runtime mkdir -p /custom-services.d echo "Download QueueCleaner service..." @@ -90,10 +69,11 @@ echo "Download Script Functions..." curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/universal/functions.bash -o /config/extended/functions echo "Done" + if [ ! -f /config/extended/naming.json ]; then - echo "Download Naming script..." - curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/naming.json -o /config/extended/naming.json - echo "Done" + echo "Download Naming script..." + curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/naming.json -o /config/extended/naming.json + echo "Done" fi mkdir -p /config/extended @@ -106,9 +86,9 @@ curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/Ex echo "Done" if [ ! -f /config/extended/sma.ini ]; then - echo "Download SMA config..." - curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/sma.ini -o /config/extended/sma.ini - echo "Done" + echo "Download SMA config..." + curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/sma.ini -o /config/extended/sma.ini + echo "Done" fi echo "Download Recyclarr service..." @@ -116,18 +96,19 @@ curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/universal echo "Done" if [ ! -f /config/extended/recyclarr.yaml ]; then - echo "Download Recyclarr config..." - curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/recyclarr.yaml -o /config/extended/recyclarr.yaml - echo "Done" + echo "Download Recyclarr config..." + curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/recyclarr.yaml -o /config/extended/recyclarr.yaml + echo "Done" fi if [ ! -f /config/extended.conf ]; then - echo "Download Extended config..." - curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/extended.conf -o /config/extended.conf - chmod 777 /config/extended.conf - echo "Done" + echo "Download Extended config..." + curl https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/radarr/extended.conf -o /config/extended.conf + chmod 777 /config/extended.conf + echo "Done" fi + chmod 777 -R /config/extended if [ -f /custom-services.d/scripts_init.bash ]; then # user misconfiguration detected, sleeping...