From 865b00625e68a590e7fb13afe3c8aa595fb97915 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 5 Apr 2023 09:30:43 -0400
Subject: [PATCH] Allow multiple MAS pre-finals to be created using the release
 script (#2664)

---
 scripts/release.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index ce4ec676..e52d1a25 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -108,9 +108,12 @@ case "${1}" in
         if [[ "${branch_name}" =~ "release-" ]]; then
             print_info "Releasing v${current_version} for MAS approval"
             new_pkg_version="${current_version}"
-            write_package_version "${new_pkg_version}"
-            if [[ "${new_pkg_version}" =~ "-mas." ]]; then
-                mas="${new_pkg_version#*-mas.}"
+            if [[ "${pkg_version}" != "${new_pkg_version}" ]]; then
+                write_package_version "${new_pkg_version}"
+            fi
+            new_tag_version=$(git describe --match "v$current_version*" --abbrev=0)
+            if [[ "${new_tag_version}" =~ "-mas." ]]; then
+                mas="${new_tag_version#*-mas.}"
             else
                 mas=0
             fi