george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140 from unixorn/make-package-iteration-iterate

Browse Source 
Set release default to the number of commits in the repo instead of always using 1
This commit is contained in:
Tom Limoncelli
2016-02-28 10:32:20 -05:00
parent aa68cd34ad 673eaae95b
commit 9f6c3f15c0
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/mk_deb_fpmdir
View File

@@ -22,8 +22,16 @@ shift
# Defaults that can be overridden: # Defaults that can be overridden:
# All packages are 1.0 unless otherwise specifed: # All packages are 1.0 unless otherwise specifed:
: ${PKGVERSION:=1.0} ; : ${PKGVERSION:=1.0} ;
# If there is no iteration setting, assume "1": # If there is no iteration set, default to use the number of commits in the repository:
: ${PKGRELEASE:=1} if [[ -z "${PKGRELEASE}" ]]; then
PKGRELEASE=$(git rev-list HEAD --count)
if [[ $? != 0 ]]; then
# We're not in a git repo, fall back to 1 so we cope with being built from
# a tarball
PKGRELEASE=1
fi
fi
# If there is no epoch, assume 0 # If there is no epoch, assume 0
: ${PKGEPOCH:=0} : ${PKGEPOCH:=0}

12
tools/mk_rpm_fpmdir
View File

@@ -22,8 +22,16 @@ shift
# Defaults that can be overridden: # Defaults that can be overridden:
# All packages are 1.0 unless otherwise specifed: # All packages are 1.0 unless otherwise specifed:
: ${PKGVERSION:=1.0} ; : ${PKGVERSION:=1.0} ;
# If there is no iteration setting, assume "1": # If there is no iteration set, default to use the number of commits in the repository:
: ${PKGRELEASE:=1} if [[ -z "${PKGRELEASE}" ]]; then
PKGRELEASE=$(git rev-list HEAD --count)
if [[ $? != 0 ]]; then
# We're not in a git repo, fall back to 1 so we cope with being built from
# a tarball
PKGRELEASE=1
fi
fi
# If there is no epoch, assume 0 # If there is no epoch, assume 0
: ${PKGEPOCH:=0} : ${PKGEPOCH:=0}