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

Update CRUD to 3.2.0. Allow overriding of VERSION for deb

This commit is contained in:
Isaac Connor 2021-04-12 17:15:14 -04:00
parent a341d2ef84
commit d48b03f40f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/packpack/startpackpack.sh
View File

@ -91,12 +91,12 @@ commonprep () {
# The rpm specfile requires we download each submodule as a tarball then manually move it into place # The rpm specfile requires we download each submodule as a tarball then manually move it into place
# Might as well do this for Debian as well, rather than git submodule init # Might as well do this for Debian as well, rather than git submodule init
CRUDVER="3.1.0-zm" CRUDVER="3.2.0"
if [ -e "build/crud-${CRUDVER}.tar.gz" ]; then if [ -e "build/crud-${CRUDVER}.tar.gz" ]; then
echo "Found existing Crud ${CRUDVER} tarball..." echo "Found existing Crud ${CRUDVER} tarball..."
else else
echo "Retrieving Crud ${CRUDVER} submodule..." echo "Retrieving Crud ${CRUDVER} submodule..."
curl -L https://github.com/ZoneMinder/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz curl -L https://github.com/FriendsOfCake/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Crud tarball retreival failed..." echo "ERROR: Crud tarball retreival failed..."
exit 1 exit 1
@ -197,7 +197,9 @@ setdebpkgname () {
# Set VERSION to {zm version}~{today's date}.{number of commits} e.g. 1.31.0~20170605.82 # Set VERSION to {zm version}~{today's date}.{number of commits} e.g. 1.31.0~20170605.82
# Set RELEASE to the packpack DIST variable e.g. Trusty # Set RELEASE to the packpack DIST variable e.g. Trusty
if [ "" == "$VERSION" ]; then
export VERSION="${versionfile}~${thedate}.${numcommits}" export VERSION="${versionfile}~${thedate}.${numcommits}"
fi
export RELEASE="${DIST}" export RELEASE="${DIST}"
checkvars checkvars