From b3488fcdec58b6347490d6b2947c4b965067bd95 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Thu, 9 Apr 2020 15:04:51 -0700
Subject: [PATCH] HBASE-24160 create-release fails to process x.y.0 version
 info correctly

Current code gives me the following; notice default values generated
for `RELEASE_VERSION` and `api_diff_tag`.

```
GIT_BRANCH [branch-2.3]:
Current branch VERSION is 2.3.0-SNAPSHOT.
RELEASE_VERSION [2.3.-1]: 2.3.0
NEXT_VERSION [2.3.0-SNAPSHOT]: 2.3.1-SNAPSHOT
RC_COUNT [0]:
GIT_REF [2.3.0RC0]:
api_diff_tag, [rel/2.2.0)]:
```

With this patch I get

```
GIT_BRANCH [branch-2.3]:
Current branch VERSION is 2.3.0-SNAPSHOT.
RELEASE_VERSION [2.3.0]:
NEXT_VERSION [2.3.1-SNAPSHOT]:
RC_COUNT [0]:
GIT_REF [2.3.0RC0]:
api_diff_tag, [rel/2.2.0]:
```

Signed-off-by: Michael Stack <stack@apache.org>
Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
---
 dev-support/create-release/release-util.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-support/create-release/release-util.sh b/dev-support/create-release/release-util.sh
index 471e7b2dfd7..99a8e902d0d 100755
--- a/dev-support/create-release/release-util.sh
+++ b/dev-support/create-release/release-util.sh
@@ -19,7 +19,7 @@
 DRY_RUN=${DRY_RUN:-0}
 GPG="gpg --pinentry-mode loopback --no-tty --batch"
 YETUS_VERSION=${YETUS_VERSION:-0.11.1}
-set -x
+set -e
 
 function error {
   echo "$*"
@@ -87,9 +87,9 @@ function get_api_diff_version {
     local major=$(echo "$version" | cut -d . -f 1)
     local minor=$(echo "$version" | cut -d . -f 2)
     if [ $minor != 0 ]; then
-      api_diff_tag="rel/${major}.$((minor - 1)).0)"
+      api_diff_tag="rel/${major}.$((minor - 1)).0"
     else
-      api_diff_tag="rel/$((major - 1)).0.0)"
+      api_diff_tag="rel/$((major - 1)).0.0"
     fi
   fi
   api_diff_tag=$(read_config "api_diff_tag", "$api_diff_tag")
@@ -136,7 +136,7 @@ function get_release_info {
     RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
   fi
 
-  local REV=$(echo "$VERSION" | cut -d . -f 3)
+  local REV=$(echo "${RELEASE_VERSION}" | cut -d . -f 3)
 
   # Find out what RC is being prepared.
   # - If the current version is "x.y.0", then this is RC0 of the "x.y.0" release.