From 7a5981eb554eaa97653a1a1f74b1ec9a44b82633 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 29 Nov 2024 13:31:04 +0800 Subject: Make ToC regeneration script path handling more robust (#5700) Co-authored-by: Anders Leino --- docs/build_toc.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/build_toc.sh') diff --git a/docs/build_toc.sh b/docs/build_toc.sh index 9c158d6a2..9c197cad6 100755 --- a/docs/build_toc.sh +++ b/docs/build_toc.sh @@ -62,7 +62,7 @@ fi temp_dir=$(mktemp -d) trap 'rm -rf "$temp_dir"' EXIT -cd "$project_root/docs" || exit 1 +docs_dir="$project_root/docs" cat >"$temp_dir/temp_program.cs" </dev/null; then + if ! git -C "$project_root" diff --quiet "docs/$dir/toc.html" 2>/dev/null; then echo "Working directory not clean, cannot check TOC" >&2 exit 1 fi fi - if ! mono "$temp_dir/toc-builder.exe" "$script_dir/$dir"; then + if ! mono "$temp_dir/toc-builder.exe" "$docs_dir/$dir"; then echo "TOC generation failed for $dir" >&2 exit 1 fi if [ "$check_only" -eq 1 ]; then - if ! git diff --quiet "$script_dir/$dir/toc.html" 2>/dev/null; then - git diff --color "$script_dir/$dir/toc.html" - git checkout -- "$script_dir/$dir/toc.html" 2>/dev/null + if ! git -C "$project_root" diff --quiet "docs/$dir/toc.html" 2>/dev/null; then + git -C "$project_root" diff --color "docs/$dir/toc.html" + git -C "$project_root" checkout -- "docs/$dir/toc.html" 2>/dev/null exit 1 fi fi -- cgit v1.2.3