Diff for /embedaddon/dnsmasq/bld/get-version between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2016/11/02 09:57:01 version 1.1.1.4, 2021/03/17 00:56:46
Line 11 Line 11
 # If there is more than one v[0-9].* tag, sort them and use the  # If there is more than one v[0-9].* tag, sort them and use the
 # first. This favours, eg v2.63 over 2.63rc6.  # 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 && \  if which git >/dev/null 2>&1 && \
    ([ -d $1/.git ] || grep '^gitdir:' $1/.git >/dev/null 2>&1); then     ([ -d .git ] || grep '^gitdir:' .git >/dev/null 2>&1) && \
    cd $1; git describe | sed 's/^v//'    git describe >/dev/null 2>&1; then 
     git describe | sed 's/^v//'
 elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then  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      echo UNKNOWN
 else  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]`

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>