From 98430474f9b27b7a353744e5234d9e2cc33aca6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20CIMBARO?= Date: Wed, 15 Jun 2022 13:43:55 +0200 Subject: [PATCH 1/3] Added support for Pufferfish 1.19 --- scripts/start-deployPufferfish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start-deployPufferfish b/scripts/start-deployPufferfish index 16a337b2f9c..bd7298ba517 100755 --- a/scripts/start-deployPufferfish +++ b/scripts/start-deployPufferfish @@ -8,8 +8,8 @@ isDebugging && set -x IFS=$'\n\t' -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" +if [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.17" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.19" ]]; then + log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc" exit 1 fi From 818951f24b6395590e89ef5b65c5a5401d421fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20CIMBARO?= <25774021+DiscowZombie@users.noreply.github.com> Date: Thu, 16 Jun 2022 18:52:26 +0200 Subject: [PATCH 2/3] Update scripts/start-deployPufferfish Co-authored-by: Geoff Bourne --- scripts/start-deployPufferfish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start-deployPufferfish b/scripts/start-deployPufferfish index bd7298ba517..9d991b8f470 100755 --- a/scripts/start-deployPufferfish +++ b/scripts/start-deployPufferfish @@ -8,7 +8,7 @@ isDebugging && set -x IFS=$'\n\t' -if [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.17" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.19" ]]; then +if ! versionLessThan 1.17; then log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc" exit 1 fi From bf5fa15b73f3a14e0bc0f7e480aee84b0aa305a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20CIMBARO?= Date: Thu, 16 Jun 2022 19:06:22 +0200 Subject: [PATCH 3/3] Removed wrong negation --- scripts/start-deployPufferfish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start-deployPufferfish b/scripts/start-deployPufferfish index 9d991b8f470..96f62558f25 100755 --- a/scripts/start-deployPufferfish +++ b/scripts/start-deployPufferfish @@ -8,7 +8,7 @@ isDebugging && set -x IFS=$'\n\t' -if ! versionLessThan 1.17; then +if versionLessThan 1.17; then log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc" exit 1 fi