From d34ebbc94b101225d7bd9babf9a15c6d2a029a2b Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 2 Nov 2022 09:24:50 -0700 Subject: [PATCH] account for adding the .0 back into the release versions starting in 3006. --- bootstrap-salt.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7ee2df7..90444b1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -639,11 +639,14 @@ elif [ "$ITYPE" = "onedir" ]; then if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then ONEDIR_REV="$1" shift - elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then - # Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix - ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/') + elif [ "$(echo "$1" | grep -E '^(3005(\.[0-9]*)?)')" != "" ]; then + # Handle the 3005.0 version as 3005 archive (pin to minor) and strip the fake ".0" suffix + ONEDIR_REV=$(echo "$1" | sed -E 's/^(3005)\.0$/\1/') ONEDIR_REV="minor/$ONEDIR_REV" shift + elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then + ONEDIR_REV="minor/$1" + shift else echo "Unknown stable version: $1 (valid: 3005, latest.)" exit 1