From e9d35123832ba0c85e1c378870be405a38732905 Mon Sep 17 00:00:00 2001
From: Bram <bram@ceulemans.dev>
Date: Sat, 5 Mar 2022 22:49:36 +0100
Subject: [PATCH] Pufferfish: Remove regex processing (#1402)

Fixes #1401
---
 scripts/start-deployPufferfish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/start-deployPufferfish b/scripts/start-deployPufferfish
index c8f7652d..34a4a5b8 100755
--- a/scripts/start-deployPufferfish
+++ b/scripts/start-deployPufferfish
@@ -8,14 +8,14 @@ isDebugging && set -x
 
 IFS=$'\n\t'
 
-if [ "${VANILLA_VERSION%.*}" != "1.18" ] && [ "${VANILLA_VERSION%.*}" != "1.17" ]; then
+if [[ "${VANILLA_VERSION}" != "1.18" ]] && [[ "${VANILLA_VERSION}" != "1.17" ]]; then
   log "ERROR: Pufferfish server type only supports versions 1.18 or 1.17, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
   exit 1
 fi
 
 : "${PUFFERFISH_BUILD:=lastSuccessfulBuild}"
 
-PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfish-${VANILLA_VERSION%.*}/${PUFFERFISH_BUILD}/api/json")
+PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfish-${VANILLA_VERSION}/${PUFFERFISH_BUILD}/api/json")
 # Example: "url": "https://ci.pufferfish.host/job/Pufferfish-1.18/50/",
 PUFFERFISH_BUILD_URL=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.url // empty' )
 # Example: "fileName": "pufferfish-paperclip-1.18.2-R0.1-SNAPSHOT-reobf.jar",
@@ -31,7 +31,7 @@ for f in pufferfish-*.jar; do
   [[ $f != "$SERVER" ]] && rm "$f"
 done
 
-if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
+if [[ ! -f "$SERVER" ]] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
     log "Downloading Pufferfish from $PUFFERFISH_BUILD_DOWNLOAD_URL ..."
     if ! get -o "$SERVER" "$PUFFERFISH_BUILD_DOWNLOAD_URL"; then
       log "ERROR: failed to download from $PUFFERFISH_BUILD_DOWNLOAD_URL (status=$?)"