ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the version detection down to after we have a repo and hence a commit history on version. Fixes CURRENT builds always being commit 0

This commit is contained in:
Isaac Connor 2022-02-02 20:56:41 -05:00
parent df16099463
commit 9973b1fbaf
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
utils/do_debian_package.sh
View File

@ -136,13 +136,6 @@ else
echo "Defaulting to master branch"; echo "Defaulting to master branch";
BRANCH="master"; BRANCH="master";
fi; fi;
if [ "$SNAPSHOT" == "NOW" ]; then
SNAPSHOT=`date +%Y%m%d%H%M%S`;
else
if [ "$SNAPSHOT" == "CURRENT" ]; then
SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
fi;
fi;
fi; fi;
fi fi
@ -150,6 +143,8 @@ if [ "$PACKAGE_VERSION" == "NOW" ]; then
PACKAGE_VERSION=`date +%Y%m%d%H%M%S`; PACKAGE_VERSION=`date +%Y%m%d%H%M%S`;
else else
if [ "$PACKAGE_VERSION" == "CURRENT" ]; then if [ "$PACKAGE_VERSION" == "CURRENT" ]; then
# git the latest (short) commit hash of the version file
versionhash=$(git log -n1 --pretty=format:%h version)
PACKAGE_VERSION="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)" PACKAGE_VERSION="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
fi; fi;
fi; fi;
@ -200,10 +195,19 @@ else
fi; fi;
cd "${GITHUB_FORK}_zoneminder_release" cd "${GITHUB_FORK}_zoneminder_release"
git checkout $BRANCH git checkout $BRANCH
cd ../
VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version` VERSION=`cat version`
if [ "$SNAPSHOT" == "NOW" ]; then
SNAPSHOT=`date +%Y%m%d%H%M%S`;
else
if [ "$SNAPSHOT" == "CURRENT" ]; then
# git the latest (short) commit hash of the version file
versionhash=$(git log -n1 --pretty=format:%h version)
SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
fi;
fi;
cd ../
if [ -z "$VERSION" ]; then if [ -z "$VERSION" ]; then
exit 1; exit 1;