X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=774e514c22fcba06e209e979e6ed2a2435d1aae8;hb=33586ee770edaa036c27508b5ec5c8c263973941;hp=8f57b75883e924dc67732af34c6bfe6d8aabeb8a;hpb=d38b7b80d136a9fafa649cd0b1a82c9d9e366cd6;p=ffmpeg

diff --git a/version.sh b/version.sh
index 8f57b75883e..774e514c22f 100755
--- a/version.sh
+++ b/version.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # check for SVN revision number
-revision=$(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)
+revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
+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
@@ -12,13 +12,13 @@ test $revision && revision=SVN-r$revision
 
 # check for git svn revision number
 if ! test $revision; then
-    revision=$(cd "$1" && git svn find-rev HEAD)
+    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)
+    revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
     test $revision && revision=git-$revision
 fi
 
@@ -26,7 +26,7 @@ fi
 test $revision || revision=UNKNOWN
 
 # releases extract the version number from the VERSION file
-version=$(cat VERSION 2> /dev/null)
+version=$(cd "$1" && cat VERSION 2> /dev/null)
 test $version || version=$revision
 
 test -n "$3" && version=$version-$3