Be a bit more fail-safe in "build-aux/git-version-gen".

The existence of a ".git" directory is not a sufficient condition to be
sure we are in a Git repository. Only overwrite the version information
file if `git describe` returns a non-empty string.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-04-19 11:36:17 +02:00
parent 621b335179
commit ddd0cb21fa

View File

@ -10,8 +10,9 @@ VERFILE="$1"
if [ -d '.git' ]
then
VERSION=`git describe --abbrev=4 --match='v[0-9]*' --dirty | sed 's/^v//'`
echo -n "$VERSION" > "$VERFILE"
VERSION=`git describe --abbrev=4 --match='v[0-9]*' --dirty 2>/dev/null`
VERSION=`echo "$VERSION" | sed 's/^v//'`
[ -n "$VERSION" ] && echo -n "$VERSION" > "$VERFILE"
fi
if [ -f "$VERFILE" ]