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

Deal with being built within a burst tarball instead of a git clone

Browse Source
This commit is contained in:
Joe Block
2016-02-27 06:50:50 -08:00
parent 982f2f0045
commit 673eaae95b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/mk_deb_fpmdir
View File

@@ -25,6 +25,11 @@ shift
# If there is no iteration set, default to use the number of commits in the repository: # If there is no iteration set, default to use the number of commits in the repository:
if [[ -z "${PKGRELEASE}" ]]; then if [[ -z "${PKGRELEASE}" ]]; then
PKGRELEASE=$(git rev-list HEAD --count) 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 fi
# If there is no epoch, assume 0 # If there is no epoch, assume 0

5
tools/mk_rpm_fpmdir
View File

@@ -25,6 +25,11 @@ shift
# If there is no iteration set, default to use the number of commits in the repository: # If there is no iteration set, default to use the number of commits in the repository:
if [[ -z "${PKGRELEASE}" ]]; then if [[ -z "${PKGRELEASE}" ]]; then
PKGRELEASE=$(git rev-list HEAD --count) 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 fi
# If there is no epoch, assume 0 # If there is no epoch, assume 0