diff options
author | Bert Gijsbers <gijhub@gmail.com> | 2017-03-06 23:07:32 +0000 |
---|---|---|
committer | Simon Kelley <simon@thekelleys.org.uk> | 2017-03-06 23:07:32 +0000 |
commit | 16f03e7139abbe48581db95421d0257a4f13d394 (patch) | |
tree | baa76ed13353b96b1edb4de75c779a9b18f1d546 /bld | |
parent | dc99058d832b96e705eb8060d39c0bcaa84cb8cd (diff) | |
download | dnsmasq-16f03e7139abbe48581db95421d0257a4f13d394.tar.gz |
Check for failure of "git describe" in get-version.
Diffstat (limited to 'bld')
-rwxr-xr-x | bld/get-version | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bld/get-version b/bld/get-version index 5372869..e472aab 100755 --- a/bld/get-version +++ b/bld/get-version @@ -11,11 +11,18 @@ # If there is more than one v[0-9].* tag, sort them and use the # first. This favours, eg v2.63 over 2.63rc6. +# Change directory to the toplevel source directory. +if test -z "$1" || ! test -d "$1" || ! cd "$1"; then + echo "$0: First argument $1 must be toplevel dir." >&2 + exit 1 +fi + if which git >/dev/null 2>&1 && \ - ([ -d $1/.git ] || grep '^gitdir:' $1/.git >/dev/null 2>&1); then - cd $1; git describe | sed 's/^v//' + ([ -d .git ] || grep '^gitdir:' .git >/dev/null 2>&1) && \ + git describe >/dev/null 2>&1; then + git describe | sed 's/^v//' elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then -# unsubstituted VERSION, but no git available. + # unsubstituted VERSION, but no git available. echo UNKNOWN else vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]` |