„scripts/start-server.sh“ ändern

Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="admin@minenet.at"
 
 RUN apt-get update && \
 	mkdir -p /usr/share/man/man1 && \
-	apt-get -y install --no-install-recommends default-jre-headless unzip && \
+	apt-get -y install --no-install-recommends default-jre-headless unzip python3 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/nzbhydra2"

scripts/start-server.sh

@@ -5,7 +5,7 @@ else
     echo "---Version manually set to: v$NZBHYDRA2_REL---"
     LAT_V="$NZBHYDRA2_REL"
 fi
-CUR_V="$(cat ${DATA_DIR}/NZBHydra2/changelog.md 2>/dev/null | grep "###" | head -1 | cut -d ' ' -f2 | cut -d 'v' -f2)"
+CUR_V="$(find ${DATA_DIR} -maxdepth 1 -name "installed-*" | cut -d '-' -f2)"
 
 if [ -z $LAT_V ]; then
     if [ -z $CUR_V ]; then
@@ -34,12 +34,13 @@ if [ -z "$CUR_V" ]; then
         sleep infinity
     fi
     mkdir ${DATA_DIR}/NZBHydra2
-    unzip ${DATA_DIR}/NZBHydra2-v$LAT_V.zip -d ${DATA_DIR}/NZBHydra2
+    unzip -o ${DATA_DIR}/NZBHydra2-v$LAT_V.zip -d ${DATA_DIR}/NZBHydra2
     chmod +x ${DATA_DIR}/NZBHydra2/nzbhydra2
+    touch ${DATA_DIR}/installed-$LAT_V
     rm ${DATA_DIR}/NZBHydra2-v$LAT_V.zip
 elif [ "$CUR_V" != "$LAT_V" ]; then
     echo "---Version missmatch, installed v$CUR_V, downloading and installing latest v$LAT_V...---"
-    rm -R ${DATA_DIR}/NZBHydra2
+    rm -rf ${DATA_DIR}/NZBHydra2 ${DATA_DIR}/installed-$CUR_V
     cd ${DATA_DIR}
     if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${DATA_DIR}/NZBHydra2-v$LAT_V.zip "https://github.com/theotherp/nzbhydra2/releases/download/v${LAT_V}/nzbhydra2-${LAT_V}-linux.zip" ; then
         echo "---Successfully downloaded NZBHydra2 v$LAT_V---"
@@ -48,8 +49,9 @@ elif [ "$CUR_V" != "$LAT_V" ]; then
         sleep infinity
     fi
     mkdir ${DATA_DIR}/NZBHydra2
-    unzip ${DATA_DIR}/NZBHydra2-v$LAT_V.zip -d ${DATA_DIR}/NZBHydra2
+    unzip -o ${DATA_DIR}/NZBHydra2-v$LAT_V.zip -d ${DATA_DIR}/NZBHydra2
     chmod +x ${DATA_DIR}/NZBHydra2/nzbhydra2
+    touch ${DATA_DIR}/installed-$LAT_V
     rm ${DATA_DIR}/NZBHydra2-v$LAT_V.zip
 elif [ "$CUR_V" == "$LAT_V" ]; then
     echo "---NZBHydra2 v$CUR_V up-to-date---"
@@ -60,6 +62,16 @@ if [ ! -d ${DATA_DIR}/.config ]; then
     mkdir -p ${DATA_DIR}/.config
 fi
 
+echo "+-------------------------------------------------------------"
+echo "|"
+echo "| This container for ARM is deprecated and is no"
+echo "| longer actively maintained or further developed!"
+echo "|"
+echo "|  Container will start in 60 seconds!"
+echo "|"
+echo "+-------------------------------------------------------------"
+sleep 60
+
 echo "---Starting NZBHydra2---"
 cd ${DATA_DIR}
-${DATA_DIR}/NZBHydra2/nzbhydra2 --datafolder ${DATA_DIR}/.config --nobrowser --nocolors ${START_PARAMS}
+/usr/bin/python3 ${DATA_DIR}/NZBHydra2/nzbhydra2wrapperPy3.py --datafolder ${DATA_DIR}/.config --nobrowser --nocolors ${START_PARAMS}