From ea9c9026e633a45fbc869e20e10c913b3b82bc14 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Sun, 16 Aug 2009 09:32:11 +0200 Subject: [PATCH] gitrev.sh: make it usable during buildkernel/world buildkernel/world operate with a reduced PATH, so we have to add the standard dirs where git could be installed. --- tools/gitrev.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/gitrev.sh b/tools/gitrev.sh index 01d0343b1d..94ba59efdd 100755 --- a/tools/gitrev.sh +++ b/tools/gitrev.sh @@ -1,23 +1,26 @@ #!/bin/sh +# We might be run during buildkernel/world, where PATH is +# limited. To reach git, we need to add the directories +# git might be located in. Not a very nice solution, but +# it works well enough. +PATH=$PATH:/usr/pkg/bin:/usr/local/bin + srcdir=${1:-$(dirname $0)} [ -n "$srcdir" ] && cd "$srcdir" -if ! which git >/dev/null 2>&1 || +if ! git version >/dev/null 2>&1 || ! cd "$(dirname "$0")" || ! git rev-parse --git-dir >/dev/null 2>&1 then - # XXX get version from newvers.sh? - echo "unknown" exit 0 fi -v=$(git describe --abbrev=4 HEAD 2>/dev/null || git rev-parse --short HEAD) +v=$(git describe --abbrev=5 2>/dev/null || git rev-parse --short HEAD) git update-index -q --refresh -[ -z "$(git diff-index --name-only HEAD --)" ] || v="$v-dirty" - -v=$(echo "$v" | sed -e 's/-/./g;s/^v//;') +v=$(echo "$v" | sed -e 'y/-/./') +[ -z "$(git diff-index --name-only HEAD --)" ] || v="$v*" echo "$v" exit 0 -- 2.11.4.GIT