build-ceph-rpm.sh: set RPM_VER/REL correctly even if on a tag

Tagged releases get a git-describe with no '-' in the string,
but RPM_VER and RPM_REL still need to get values.  Also,
refactor/simplify a bit.

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index 64c0a94a5a2410157688371355b9b758573edb34..7a999515f455a68f77b71e10176eb5f044778665 100755 (executable)
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -12,12 +12,15 @@ REV="$(git rev-parse HEAD)"
 VER="$(git describe)"
 
 # Reformat version if needed to match RPM version and release
-if expr index $(git describe --always) '-' > /dev/null ; then
-    desc=$(git describe --always | sed 's/^v//')
+desc=$(git describe --always | sed 's/^v//')
+if expr index $desc '-' > /dev/null ; then
     RPM_VER=$(echo $desc | cut -d'-' -f1)
     RPM_REL=$(echo $desc | cut -d- -f2- | tr '-' '.')
-    VER=${RPM_VER}-${RPM_REL}
+else
+    RPM_VER=$desc
+    RPM_REL=0
 fi
+VER=${RPM_VER}-${RPM_REL}
 
 # Try to determine branch name
 BRANCH=$(../branches.sh -v | grep $REV | awk '{print $2}') || BRANCH="unknown"