From 354dc3d2723fc79c3c1db8e6efc88fdc5c1cc734 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 29 Dec 2025 11:07:04 +0100 Subject: [PATCH] docs: use correct version file for HTML docs from tarball Prior to commit 135fc73191d (Remove man/HTML docs from tarball, require Sphinx instead, 2025-11-20), HTML docs were built from a Git worktree. Now they are built in the tarball. We call build_tools/git_version_gen.sh from doc_src so it fails to find the version file. Fix that. Fixes #12228 --- build_tools/git_version_gen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh index fcf73c3f1..d5d576fbd 100755 --- a/build_tools/git_version_gen.sh +++ b/build_tools/git_version_gen.sh @@ -13,9 +13,9 @@ git_permission_failed=0 # First see if there is a version file (included in release tarballs), # then try git-describe, then default. -if test -f version +if test -f "$FISH_BASE_DIR"/version then - VN=$(cat version) || VN="$DEF_VER" + VN=$(cat "$FISH_BASE_DIR"/version) || VN="$DEF_VER" else if VN=$(git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then :