From 8fab4007c83349e5dbaacca735ce698cf94bf8e4 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sun, 19 Jun 2011 19:51:20 +0200 Subject: Use the contents of RELEASE as version fallback instead of 'UNKNOWN' This makes binaries produced by source tarballs identify themselves with the version number of the corresponding release series, unless overriden by a 'VERSION' file. --- version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'version.sh') diff --git a/version.sh b/version.sh index 6ec2b25..7911e46 100755 --- a/version.sh +++ b/version.sh @@ -5,7 +5,7 @@ revision=$(cd "$1" && git describe --always 2> /dev/null) test "$revision" && revision=git-$revision # 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) -- cgit v1.1 From 8d3d3436e2596e27571b86eb97c66971a1a7431b Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 19 Jun 2011 19:31:56 +0100 Subject: Drop git- prefix from version labels Signed-off-by: Mans Rullgard --- version.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'version.sh') diff --git a/version.sh b/version.sh index 7911e46..6f72b2c 100755 --- a/version.sh +++ b/version.sh @@ -2,7 +2,6 @@ # check for git short hash revision=$(cd "$1" && git describe --always 2> /dev/null) -test "$revision" && revision=git-$revision # no revision number found test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null) -- cgit v1.1