From e79123866bf5fbffcd22e75c2a658952fc72a3ca Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Mon, 6 Jul 2009 15:41:17 -0400 Subject: [PATCH] tools: git-gen-version fallback to VERSION file if things goes wrong Signed-off-by: Jean Privat --- VERSION | 1 + src/git-gen-version.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..f5303c6 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +v0.2.1-git diff --git a/src/git-gen-version.sh b/src/git-gen-version.sh index ada2d60..25b9a01 100755 --- a/src/git-gen-version.sh +++ b/src/git-gen-version.sh @@ -41,13 +41,21 @@ if [ ! -f nitc.nit ]; then fi VN=$(git describe --always HEAD 2>/dev/null) +if [ "$?" != "0" ]; then + if [ -r ../VERSION ]; then + VN="$(cat ../VERSION)" + else + echo >&2 "Error: no VERSION file and not a .git repository." + exit 1 + fi +fi if [ -z "$VN" ]; then VN="undefined" fi if [ -n "$1" ]; then VN="${VN}_$1" fi -if [ -n "$(git diff HEAD)" ]; then +if [ -n "$(git diff HEAD 2>/dev/null)" ]; then VN="${VN}_dirty" fi -- 1.7.9.5