From f224bf7262d349c38d9dccddc2961798acff595c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 29 Dec 2023 12:34:20 -0500 Subject: [PATCH] Use either version or version.txt. Fixes #3798 --- utils/do_debian_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index 7df2a3106..4b2d09f8f 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -142,7 +142,7 @@ if [ "$SNAPSHOT" == "stable" ]; then BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`; if [ -z "$BRANCH" ]; then # This should only happen in CI environments where tag info isn't available - BRANCH=`cat version.txt` + BRANCH=$(cat "$(find . -name 'version' -o -name 'version.txt')") echo "Building branch $BRANCH" fi if [ "$BRANCH" == "" ]; then @@ -180,7 +180,7 @@ fi; echo "git pull..." git pull # Grab the ZoneMinder version from the contents of the version file -VERSION=$(cat version.txt) +VERSION=$(cat "$(find . -name 'version' -o -name 'version.txt')") if [ -z "$VERSION" ]; then exit 1; fi;