diff options
| author | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-04-19 11:36:17 +0200 |
|---|---|---|
| committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-04-22 02:47:38 +0200 |
| commit | ddd0cb21fa223b7c410805868380301b31714812 (patch) | |
| tree | 6701c4613ee1a9f7b7a66c018d6a79972369e909 /build-aux | |
| parent | 621b3351798f5c78c5907bcfbc10217a63c4ae3f (diff) | |
| download | calcurse-ddd0cb21fa223b7c410805868380301b31714812.tar.gz calcurse-ddd0cb21fa223b7c410805868380301b31714812.zip | |
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>
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/git-version-gen | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 2cc88fc..331faef 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -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" ] |