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

version 1.1.1.1, 2013/07/29 19:37:40 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.
   
if which git >/dev/null 2>&1 && [ -d $1/.git ]; then# Change directory to the toplevel source directory.
     cd $1; git describeif 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 .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  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]`
   
      if [ $? -eq 0 ]; then       if [ $? -eq 0 ]; then
         echo "${vers}" | sort | head -n 1 | sed 's/^v//'         echo "${vers}" | sort -r | head -n 1 | sed 's/^v//'
      else       else
          cat $1/VERSION           cat $1/VERSION
      fi       fi

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


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