change to subfolder

hotio · Mar 11, 2024 · 3bdba5b · 3bdba5b
1 parent 17ad287
commit 3bdba5b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -8,16 +8,16 @@ ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="6789/tcp,6789/udp"
 
 RUN apk add --no-cache py3-lxml
 
-# install app
 ARG VERSION
 RUN runfile="/tmp/app.run" && \
+    mkdir "${APP_DIR}/bin" && \
     curl -fsSL -o "${runfile}" "https://github.com/nzbgetcom/nzbget/releases/download/v${VERSION}/nzbget-${VERSION}-bin-linux.run" && \
-    sh "${runfile}" --destdir "${APP_DIR}" && \
+    sh "${runfile}" --destdir "${APP_DIR}/bin" && \
     rm "${runfile}" && \
-    rm -rf "${APP_DIR}/unrar" "${APP_DIR}/7za" && \
-    chmod -R u=rwX,go=rX "${APP_DIR}" && \
-    chown -R root:root "${APP_DIR}"
+    rm -rf "${APP_DIR}/bin/unrar" "${APP_DIR}/bin/7za" && \
+    chmod -R u=rwX,go=rX "${APP_DIR}/bin" && \
+    chown -R root:root "${APP_DIR}/bin"
 
 COPY root/ /
 
-RUN chmod 755 "${APP_DIR}/scripts/"*
+RUN chmod 755 "${APP_DIR}/bin/scripts/"*
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -8,16 +8,16 @@ ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="6789/tcp,6789/udp"
 
 RUN apk add --no-cache py3-lxml
 
-# install app
 ARG VERSION
 RUN runfile="/tmp/app.run" && \
+    mkdir "${APP_DIR}/bin" && \
     curl -fsSL -o "${runfile}" "https://github.com/nzbgetcom/nzbget/releases/download/v${VERSION}/nzbget-${VERSION}-bin-linux.run" && \
-    sh "${runfile}" --destdir "${APP_DIR}" && \
+    sh "${runfile}" --destdir "${APP_DIR}/bin" && \
     rm "${runfile}" && \
-    rm -rf "${APP_DIR}/unrar" "${APP_DIR}/7za" && \
-    chmod -R u=rwX,go=rX "${APP_DIR}" && \
-    chown -R root:root "${APP_DIR}"
+    rm -rf "${APP_DIR}/bin/unrar" "${APP_DIR}/bin/7za" && \
+    chmod -R u=rwX,go=rX "${APP_DIR}/bin" && \
+    chown -R root:root "${APP_DIR}/bin"
 
 COPY root/ /
 
-RUN chmod 755 "${APP_DIR}/scripts/"*
+RUN chmod 755 "${APP_DIR}/bin/scripts/"*
diff --git a/root/app/scripts/FileFixer.sh → root/app/bin/scripts/FileFixer.sh b/root/app/scripts/FileFixer.sh → root/app/bin/scripts/FileFixer.sh
diff --git a/root/app/scripts/HashRenamer.py → root/app/bin/scripts/HashRenamer.py b/root/app/scripts/HashRenamer.py → root/app/bin/scripts/HashRenamer.py
diff --git a/root/app/scripts/WtFnZb-Renamer.py → root/app/bin/scripts/WtFnZb-Renamer.py b/root/app/scripts/WtFnZb-Renamer.py → root/app/bin/scripts/WtFnZb-Renamer.py
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run
@@ -20,6 +20,6 @@ if [[ ! -f "${CONFIG_DIR}/nzbget.conf" ]]; then
         -e "s#\\(ShellOverride=\\).*#\\1.py=/usr/bin/python3#g" \
         -e "s#\\(UnrarCmd=\\).*#\\1unrar#g" \
         -e "s#\\(SevenZipCmd=\\).*#\\17z#g" \
-        "${APP_DIR}/nzbget.conf" > "${CONFIG_DIR}/nzbget.conf"
+        "${APP_DIR}/bin/nzbget.conf" > "${CONFIG_DIR}/nzbget.conf"
     chown hotio:hotio "${CONFIG_DIR}/nzbget.conf"
 fi
diff --git a/root/etc/s6-overlay/s6-rc.d/service-nzbget/run b/root/etc/s6-overlay/s6-rc.d/service-nzbget/run
@@ -3,4 +3,4 @@
 
 umask "${UMASK}"
 
-exec s6-setuidgid hotio "${APP_DIR}/nzbget" --server --option OutputMode=log --configfile "${CONFIG_DIR}/nzbget.conf"
+exec s6-setuidgid hotio "${APP_DIR}/bin/nzbget" --server --option OutputMode=log --configfile "${CONFIG_DIR}/nzbget.conf"