From 3dc02d89362a00b6e41b01c186861ee3c40f95f2 Mon Sep 17 00:00:00 2001
From: christopher blodgett <christopher.blodgett@gmail.com>
Date: Sun, 6 Mar 2022 11:33:45 -0800
Subject: [PATCH 1/3] adding major version for pufferfish

---
 scripts/start-configuration    |  4 +++-
 scripts/start-deployPufferfish |  4 ++--
 scripts/start-utils            | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/scripts/start-configuration b/scripts/start-configuration
index 692a339d223..a3720a52bb2 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -116,7 +116,9 @@ case "X$VERSION" in
   ;;
 esac
 export VANILLA_VERSION
-log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"
+MAJOR_VANILLA_VERSION=$(get_major_version "$VANILLA_VERSION")
+export MAJOR_VANILLA_VERSION
+log "Resolved version given ${VERSION} into ${VANILLA_VERSION} and major version ${MAJOR_VANILLA_VERSION}"
 
 cd /data || exit 1
 
diff --git a/scripts/start-deployPufferfish b/scripts/start-deployPufferfish
index 34a4a5b8312..16a337b2f9c 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 [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_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-${MAJOR_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",
diff --git a/scripts/start-utils b/scripts/start-utils
index eea451a31a5..8465112156d 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -8,6 +8,26 @@ function join_by() {
   printf "%s" "${@/#/$d}"
 }
 
+function split_by () {
+    string=$1
+    separator=$2
+
+    tmp=${string//"$separator"/$'\2'}
+    IFS=$'\2' read -a arr <<< "$tmp"
+    for substr in "${arr[@]}" ; do
+        echo "$substr"
+    done
+    echo
+}
+
+function get_major_version() {
+  version=$1
+  split_verison=$(split_by "$version" ".")
+  array_version=("${split_verison[0]}")
+  # Do not quote arrays as it will break the join by function.
+  join_by "." ${array_version[0]} ${array_version[1]}
+}
+
 function isURL() {
   local value=$1
 

From 78a3d73591b007a6d7a7379edd6b542e6b61cd59 Mon Sep 17 00:00:00 2001
From: christopher blodgett <christopher.blodgett@gmail.com>
Date: Sun, 6 Mar 2022 11:42:03 -0800
Subject: [PATCH 2/3] fixing test as well as fixing a quote that was added due
 to linter recommendation

---
 scripts/start-utils                                | 2 +-
 tests/setuponlytests/pufferfish/docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/start-utils b/scripts/start-utils
index 8465112156d..fba9b4753e8 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -23,8 +23,8 @@ function split_by () {
 function get_major_version() {
   version=$1
   split_verison=$(split_by "$version" ".")
-  array_version=("${split_verison[0]}")
   # Do not quote arrays as it will break the join by function.
+  array_version=(${split_verison[0]})
   join_by "." ${array_version[0]} ${array_version[1]}
 }
 
diff --git a/tests/setuponlytests/pufferfish/docker-compose.yml b/tests/setuponlytests/pufferfish/docker-compose.yml
index bad46b0d3ad..89438dd3828 100644
--- a/tests/setuponlytests/pufferfish/docker-compose.yml
+++ b/tests/setuponlytests/pufferfish/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
       TYPE: PUFFERFISH
-      VERSION: 1.18
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
       PUFFERFISH_BUILD: 50
     volumes:
       - ./data:/data

From fd2f02397dd11ea89622858c13c9ec745b649152 Mon Sep 17 00:00:00 2001
From: christopher blodgett <christopher.blodgett@gmail.com>
Date: Sun, 6 Mar 2022 12:44:38 -0800
Subject: [PATCH 3/3] Changing get major version to using a simple cut command

---
 scripts/start-utils | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/scripts/start-utils b/scripts/start-utils
index fba9b4753e8..8e2ee94e7d1 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -8,24 +8,9 @@ function join_by() {
   printf "%s" "${@/#/$d}"
 }
 
-function split_by () {
-    string=$1
-    separator=$2
-
-    tmp=${string//"$separator"/$'\2'}
-    IFS=$'\2' read -a arr <<< "$tmp"
-    for substr in "${arr[@]}" ; do
-        echo "$substr"
-    done
-    echo
-}
-
 function get_major_version() {
   version=$1
-  split_verison=$(split_by "$version" ".")
-  # Do not quote arrays as it will break the join by function.
-  array_version=(${split_verison[0]})
-  join_by "." ${array_version[0]} ${array_version[1]}
+  echo "$version" | cut -d. -f 1-2
 }
 
 function isURL() {