From: Uwe Zeisberger Date: Thu, 26 Jan 2006 16:39:27 GMT Subject: [PATCH] Make GIT-VERSION-GEN tolerate missing git describe command again Message-ID: <1138293567831-git-send-email-Uwe_Zeisberger@digi.com> In-Reply-To: <20060126134521.GA11570@informatik.uni-freiburg.de> Commit 5c7d3c95 broke that by making the git-describe command part of a pipe. Signed-off-by: Uwe Zeisberger --- GIT-VERSION-GEN | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) b5763601050151e944cb58b3b0fe6f4aee88b47f diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e3cd9fa..72201be 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -5,9 +5,11 @@ DEF_VER=v1.1.GIT # First try git-describe, then see if there is a version file # (included in release tarballs), then default -VN=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') || -VN=$(cat version) || -VN="$DEF_VER" +if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then + VN=$(echo "$VN" | sed -e 's/-/./g'); +else + VN=$(cat version) || VN="$DEF_VER" +fi VN=$(expr "$VN" : v*'\(.*\)') -- 1.1.4-g9acfd