make enterprise version script more flexible

hashicorp · Sep 28, 2023 · 2395648 · 2395648
1 parent 5f34a84
commit 2395648
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/control-plane/build-support/scripts/consul-enterprise-version.sh b/control-plane/build-support/scripts/consul-enterprise-version.sh
@@ -4,10 +4,10 @@
 FILE=$1
 VERSION=$(yq .global.image $FILE)
 
-if [[ !"${VERSION}" == *"hashicorppreview/consul:"* ]]; then
-	VERSION=$(echo ${VERSION} | sed "s/consul:/consul-enterprise:/g")
-elif [[ !"${VERSION}" == *"hashicorp/consul:"* ]]; then
+if [[ !"${VERSION}" == *"hashicorp/consul:"* ]]; then
 	VERSION=$(echo ${VERSION} | sed "s/consul:/consul-enterprise:/g" | sed "s/$/-ent/g")
+else
+  VERSION=$(echo ${VERSION} | sed "s/consul:/consul-enterprise:/g")
 fi
 
-echo "${VERSION}"
+echo "${VERSION}"