From 75b43353ce67ae133750481bf82943034891f98b Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Mon, 11 Jul 2011 23:51:33 +0200 Subject: [PATCH] Fix generate_version.sh for release tarballs --- generate-version.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/generate-version.sh b/generate-version.sh index c2c4b63..b538611 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -4,18 +4,19 @@ git_available_p() { # Check that (1) we have git (2) this is a git tree. if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null ) then - true + echo "ok" else - false + echo "" fi } generate_version() { - if [ -f version.lisp-expr -a ! git_available_p ] + AVAILABLE=$(git_available_p) + if [ -f version.lisp-expr -a -z "$AVAILABLE" ] then # Relase tarball, leave version.lisp-expr alone. return - elif [ ! git_available_p ] + elif [ -z "$AVAILABLE" ] then echo "Can't run 'git describe' and version.lisp-expr is missing." >&2 echo "To fix this, either install git or create a fake version.lisp-expr file." >&2 -- 1.7.10.4