Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak get-version to do the right thing with multiple head tags.

Browse Source
This commit is contained in:
Simon Kelley
2012-08-17 14:18:50 +01:00
parent 476e4a03c1
commit 00acd06340
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bld/get-version
View File

@@ -8,6 +8,8 @@
# which has a set of references substituted into it by git. # which has a set of references substituted into it by git.
# If we can find one which matches $v[0-9].* then we assume it's # If we can find one which matches $v[0-9].* then we assume it's
# a version-number tag, else we just use the whole string. # a version-number tag, else we just use the whole string.
# If there is more than one v[0-9].* tag, sort them and use the
# first. This favours, eg v2.63 over 2.63rc6.
if which git >/dev/null 2>&1 && [ -d $1/.git ]; then if which git >/dev/null 2>&1 && [ -d $1/.git ]; then
cd $1; git describe cd $1; git describe
@@ -18,7 +20,7 @@ else
vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep $v[0-9]` vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep $v[0-9]`
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "${vers}" | head -n 1 | sed 's/^v//' echo "${vers}" | sort | head -n 1 | sed 's/^v//'
else else
cat $1/VERSION cat $1/VERSION
fi fi