From d850d026ed4827af1b030bd226aeac63558b1ef7 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sun, 27 Aug 2023 17:02:12 +0100
Subject: [PATCH] fixes

---
 Dockerfile      | 19 +++----------------
 scripts/init.sh | 10 ++++++++++
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb466151..e9d1a149 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,6 @@ ENV VERSION_TAG=$VERSION_TAG
 
 ENV ENABLE_SECURITY=false
 
-ARG ALPHA=false
-ENV ALPHA=$ALPHA
-
-
 # Create scripts folder and copy local scripts
 RUN mkdir /scripts
 COPY ./scripts/* /scripts/
@@ -20,18 +16,9 @@ COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 RUN fc-cache -f -v
 
-# Depending on the ENABLE_SECURITY flag, download the correct JAR
-COPY build/libs/*.jar app-temp.jar
-RUN if [ "$ALPHA" = "true" ]; then \
-        mv app-temp.jar app.jar; \
-    elif [ "$ENABLE_SECURITY" = "true" ]; then \
-        wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login-$VERSION_TAG.jar; \
-        rm -f app-temp.jar; \
-    else \
-        wget -O app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-$VERSION_TAG.jar; \
-        rm -f app-temp.jar; \
-    fi
-    
+# Always copy the JAR 
+COPY build/libs/*.jar app.jar
+
 # Expose the application port
 EXPOSE 8080
 
diff --git a/scripts/init.sh b/scripts/init.sh
index 99ff2226..336c3526 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -16,6 +16,16 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
   done
 fi
 
+# Check for ENABLE_SECURITY and download the appropriate JAR if required
+if [ "$ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
+	echo "Downloading from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
+    curl -L -o new-app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+    if [ $? -eq 0 ]; then  # checks if curl was successful
+        rm -f app.jar
+        mv new-app.jar app.jar
+    fi
+fi
+
 
 # Run the main command
 exec "$@"
\ No newline at end of file