diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-03-06 20:18:31 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-03-06 20:18:31 +0000 |
| commit | f5ceb958cd51418998100bcd6f69964d95807246 (patch) | |
| tree | 7cd61efca7817e2d341e47443627ffd99b6078a4 | |
| parent | meson/PKGBUILD/changelog: prepare for 1.2.0 (diff) | |
generate-version: check for .git directory in *src* dir
Instead of trying to run `git --rev-parse --is-inside-work-tree`,
check if there's a .git directory under the source directory.
This should fix an issue where we incorrectly decided we where in a
foot git clone when we're just a subdirectory under another
repository.
| -rwxr-xr-x | generate-version.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generate-version.sh b/generate-version.sh index 89e1fa20..ecd0306f 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -10,7 +10,7 @@ out_file=${3} # echo "source directory: ${src_dir}" # echo "output file: ${out_file}" -if command -v git > /dev/null && git rev-parse --is-inside-work-tree > /dev/null 2>&1 ; then +if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then workdir=$(pwd) cd "${src_dir}" git_version=$(git describe --always --tags) |
