mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2025-12-23 22:37:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use either version or version.txt. Fixes #3798

Browse Source
This commit is contained in:
Isaac Connor
2023-12-29 12:34:20 -05:00
parent deb880e99b
commit f224bf7262
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/do_debian_package.sh
View File

@@ -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;