From 95287575857a96b049b5e7faeb03fd36c3a9df07 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 4 Jan 2015 23:12:07 +0000 Subject: [PATCH 1/1] GIT-VERSION-GEN: Recognize git version in gitweb snapshots. gitweb prepends the repo name and the git version number to all paths of the snapshot tarballs (example: paraslash-32a81d7/). This commit teaches GIT-VERSION-GEN to make use of this information. The patched script reports the git version thusly encoded in the current directory, rather than resort to "unnamed_version" as before. --- GIT-VERSION-GEN | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index df7ed327..b8abff35 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -8,7 +8,7 @@ LF=' ' # First see if there is a version file (included in release tarballs), -# then try git-describe, then default. +# then try git-describe, then gitweb, then default. if [[ -f VERSION ]]; then VN=$(cat VERSION) || VN="$DEF_VER" elif [[ -d .git || -f .git ]] && @@ -22,6 +22,8 @@ elif [[ -d .git || -f .git ]] && esac then VN=$(echo "$VN" | sed -e 's/-/./g'); +elif [[ "$PWD" =~ paraslash-[a-f0-9]{1,} ]]; then + VN="${PWD#*-}" else VN="$DEF_VER" fi -- 2.39.2