X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=f8510ea28ccfbc36959cf9b4234261a06b2a3313;hb=67f34aaa9746f6446baf112639ff8c6e5a0fa4ba;hp=39bef80af17b591bea895e59b6b7bcfd358dcd6e;hpb=31c194e7f9483cb067c31bb64bc0d719e2823e25;p=ffmpeg

diff --git a/version.sh b/version.sh
index 39bef80af17..f8510ea28cc 100755
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 
 # 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" && 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,11 +26,16 @@ 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
 
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
 NEW_REVISION="#define FFMPEG_VERSION \"$version\""
 OLD_REVISION=$(cat version.h 2> /dev/null)