diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-08 12:32:14 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-08 12:32:14 -0400 |
| commit | 4b54057569a01af001d2d4b78330534ecc195fe3 (patch) | |
| tree | e8574b882494f73935a9d7b7f8607584d29cb903 /tools | |
| parent | d79e3a21c6fd34a4994a20431cf2566f9405e024 (diff) | |
fix definition of release version info in the case where git describe --tags returns a precise tag, rather than tag-REVCOUNT
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linux_packaging/define_versions.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/linux_packaging/define_versions.sh b/tools/linux_packaging/define_versions.sh index 611df8017e..188ca7167f 100644 --- a/tools/linux_packaging/define_versions.sh +++ b/tools/linux_packaging/define_versions.sh @@ -4,9 +4,11 @@ release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` -revcount=`echo $r | cut -d- -f1` +if echo $r | grep -q -e - ; then + revcount=`echo $r | cut -d- -f1` +fi commit=`echo $r | cut -d- -f2` -version=${release_version}.${revcount} +version=${release_version}${revcount:+:.revcount} # # Figure out the Build Type |