From 15ed9bf06ddb85e622fe062a6c0a7168dde6f57e Mon Sep 17 00:00:00 2001
From: anon8675309 <anon8675309@github.com>
Date: Sun, 20 Jun 2021 20:42:43 -0500
Subject: [PATCH] Attempting to build the lastest tag instead of a hard-coded
 one

---
 utils/do_debian_package.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 33903feae..979c32cec 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -118,16 +118,12 @@ else
   fi;
   if [ "$SNAPSHOT" == "stable" ]; then
     if [ "$BRANCH" == "" ]; then
-      echo "About to run some basic commands for debugging..."
-      pwd; ls; git remote -v; git branch -v; git status
-      echo "Listing all of the tags for this repo:"
-      git tag -l
-      echo "About to get the hash of the most recent tag"
-      REV=$(git rev-list --tags --max-count=1)
-      echo "REV = $REV"
+      #REV=$(git rev-list --tags --max-count=1)
       BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
-      echo "BRANCH = $BRANCH"
-      BRANCH=`git tag -l | sort | grep -v '^v.*' | tail -n 1`
+      if [ -z "$BRANCH" ]; then
+        # This should only happen in CI environments where tag info isn't available
+        BRANCH=`grep ' release$' distros/fedora/zoneminder.spec | head -n 1 | sed -e 's/ release//g' -e 's/[^0-9]*//'`
+      fi
       echo "BRANCH = $BRANCH"
       if [ "$BRANCH" == "" ]; then
         echo "Unable to determine latest stable branch!"