X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=6f72b2c2e6ee66aad29379da5a4cd6428a622c58;hb=3db8db406ff213bf177cc23c44f6cbc8778b1bea;hp=66a1c6f0ac17412ff013f0ee3be68b31d94d8194;hpb=a03be6e1ba4cbf9984b0bbdb674704bbb2da6713;p=ffmpeg diff --git a/version.sh b/version.sh index 66a1c6f0ac1..6f72b2c2e6e 100755 --- a/version.sh +++ b/version.sh @@ -1,16 +1,10 @@ #!/bin/sh -revision=$(cd "$1" && cat snapshot_version 2> /dev/null) -test "$revision" && revision=SVN-r$revision - # check for git short hash -if ! test "$revision"; then - revision=$(cd "$1" && git describe --always 2> /dev/null) - test "$revision" && revision=git-$revision -fi +revision=$(cd "$1" && git describe --always 2> /dev/null) # no revision number found -test "$revision" || revision=UNKNOWN +test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null) # releases extract the version number from the VERSION file version=$(cd "$1" && cat VERSION 2> /dev/null)