diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-04-22 05:07:03 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-04-23 01:57:53 +0200 |
commit | eabba2de4d4b135c9b2fe63435662e90a4d763e0 (patch) | |
tree | d0189ccf895386f7de6c8cbc58aa2cfd87230c1d /version.sh | |
parent | 1bcb2f999e650c0c16f4f0ccd442d6db47e20f32 (diff) | |
download | mpv-eabba2de4d4b135c9b2fe63435662e90a4d763e0.tar.bz2 mpv-eabba2de4d4b135c9b2fe63435662e90a4d763e0.tar.xz |
Release 0.25.0v0.25.0
Also update release policy documentation and version extraction.
Diffstat (limited to 'version.sh')
-rwxr-xr-x | version.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/version.sh b/version.sh index 674c6a1633..e79ad0ca89 100755 --- a/version.sh +++ b/version.sh @@ -33,15 +33,13 @@ fi # Extract revision number from file used by daily tarball snapshots # or from "git describe" output git_revision=$(cat snapshot_version 2> /dev/null) -test "$git_revision" || test ! -e .git || git_revision="$(git rev-parse --short HEAD)" -test "$git_revision" && git_revision="git-$git_revision" +test "$git_revision" || test ! -e .git || git_revision="$(git describe \ + --match "v[0-9]*" --always --tags | sed 's/^v//')" version="$git_revision" -# releases extract the version number from the VERSION file -releaseversion="$(cat VERSION 2> /dev/null)" -if test "$releaseversion" ; then - test "$version" && version="-$version" - version="$releaseversion$version" +# other tarballs extract the version number from the VERSION file +if test ! "$version"; then + version="$(cat VERSION 2> /dev/null)" fi test "$version" || version=UNKNOWN |