From ecca5c2df935d2f1d96b31c6b02b21eca3bf2be9 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Wed, 31 Jul 2024 09:26:51 -0400
Subject: [PATCH] Use proper new api and locations, redo how i handle a lot of
 the jq work

---
 Dockerfile |  1 +
 build.sh   | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c66471f..a2ab0ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ RUN apt-get update \
     jq \
     && apt-get clean
 
+RUN deluser ubuntu
 RUN addgroup --gid 1000 velocity \
   && adduser --system --shell /bin/false --uid 1000 --ingroup velocity --home /data velocity
 RUN mkdir /velocity && chown 1000:1000 /velocity
diff --git a/build.sh b/build.sh
index b43d779..5679807 100755
--- a/build.sh
+++ b/build.sh
@@ -1,14 +1,23 @@
 #!/bin/bash
 
-curl 'https://papermc.io/api/v2/projects/velocity/version_group/3.3.0/builds' -H 'User-Agent: docker-build simcop2387@simcop2387.info' | jq -r '.builds[-1]' | tee /tmp/velocity.json
-wget -O /tmp/velocity.jar $(jq -r '"https://papermc.io/api/v2/projects/velocity/versions/"+(.version|tostring)+"/builds/"+(.build|tostring)+"/downloads/"+ (.downloads.application.name|tostring)' < /tmp/velocity.json)
-CALCULATED=$(sha256sum /tmp/velocity.jar | cut -d' ' -f1)
-PROVIDED=$(jq -r '.downloads.application.sha256' < /tmp/velocity.json)
+set -euxo pipefail
 
-if [[ $CALCULATED == $PROVIDED ]]; then
+JSON=$(curl 'https://api.papermc.io/v2/projects/velocity/versions/3.3.0-SNAPSHOT/builds' -H 'User-Agent: docker-build simcop2387@simcop2387.info')
+
+
+BUILD=$(echo $JSON | jq -r '.builds[-1]')
+VERSION=$(echo $JSON | jq -r '.version')
+BUILD_ID=$(echo $BUILD | jq -r '.build')
+FILENAME=$(echo $BUILD | jq -r '.downloads.application.name')
+CHECKSUM=$(echo $BUILD | jq -r '.downloads.application.sha256')
+
+wget -O /tmp/velocity.jar "https://api.papermc.io/v2/projects/velocity/versions/${VERSION}/builds/${BUILD_ID}/downloads/${FILENAME}"
+CALCULATED=$(sha256sum /tmp/velocity.jar | cut -d' ' -f1)
+
+if [[ $CALCULATED == $CHECKSUM ]]; then
         echo download successful, moving to final location
         mv /tmp/velocity.jar /velocity/
 else
-        echo FAILED SHA256 SUM CHECK: $CALCULATED != 
+        echo FAILED SHA256 SUM CHECK: $CALCULATED != $CHECKSUM 
         exit 127
 fi