X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=3269e038a7ae0bbe4e9f55393109b44786af37ba;hb=0f86fcabdf74f658323140111dfd4de83f7f2eee;hp=5b5f451534a227ff0575c7786c20170ee051ff2a;hpb=8202d905cd0df4b8fbb29535a1d422f28d204059;p=ffmpeg

diff --git a/version.sh b/version.sh
index 5b5f451534a..3269e038a7a 100755
--- a/version.sh
+++ b/version.sh
@@ -2,35 +2,40 @@
 
 # check for SVN revision number
 revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
-test $revision || revision=$(cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2)
-test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n
+test "$revision" || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
+test "$revision" || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2)
+test "$revision" || revision=$(cd "$1" && sed -n -e '/^dir$/{n
 p
 q
 }' .svn/entries 2>/dev/null)
-test $revision && revision=SVN-r$revision
+test "$revision" && revision=SVN-r$revision
 
 # check for git svn revision number
-if ! test $revision; then
-    revision=$(cd "$1" && git svn find-rev HEAD)
-    test $revision && revision=git-svn-r$revision
+if ! test "$revision"; then
+    revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
+    test "$revision" && revision=git-svn-r$revision
 fi
 
 # check for git short hash
-if ! test $revision; then
-    revision=$(cd "$1" && git log -1 --pretty=format:%h)
-    test $revision && revision=git-$revision
+if ! test "$revision"; then
+    revision=$(cd "$1" && git describe --always 2> /dev/null)
+    test "$revision" && revision=git-$revision
 fi
 
 # no revision number found
-test $revision || revision=UNKNOWN
+test "$revision" || revision=UNKNOWN
 
 # releases extract the version number from the VERSION file
 version=$(cd "$1" && cat VERSION 2> /dev/null)
-test $version || version=$revision
+test "$version" || version=$revision
 
 test -n "$3" && version=$version-$3
 
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
 NEW_REVISION="#define FFMPEG_VERSION \"$version\""
 OLD_REVISION=$(cat version.h 2> /dev/null)