Merge pull request #62 from cptchuckles/case-insensitive

Force defaults and lowercase values for MC_VERSION and PAPER_BUILD
Phyremaster · Sep 8, 2023 · 673c1e2 · 673c1e2
2 parents 14f33cf + f591cf2
commit 673c1e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN apk update \
     && mkdir /papermc
 
 # Start script
-CMD ["sh", "./papermc.sh"]
+CMD ["bash", "./papermc.sh"]
 
 # Container setup
 EXPOSE 25565/tcp

diff --git a/papermc.sh b/papermc.sh
@@ -3,6 +3,14 @@
 # Enter server directory
 cd papermc
 
+# Set nullstrings back to 'latest'
+: ${MC_VERSION:=latest}
+: ${PAPER_BUILD:=latest}
+
+# Lowercase these to avoid 404 errors on wget
+MC_VERSION=${MC_VERSION,,}
+PAPER_BUILD=${PAPER_BUILD,,}
+
 # Get version information and build download URL and jar name
 URL=https://papermc.io/api/v2/projects/paper
 if [ ${MC_VERSION} = latest ]