fix(hooks): preserve exec bit on re-run and fix pipefail on empty grep

Two bugs in setup-hooks.sh:
1. awk+mv to replace a marker block created a 644 temp file, losing the
   exec bit. chmod +x after every write_block call fixes this. Regression
   test added to idempotency block.
2. set -euo pipefail in the deployed pre-commit hook caused grep to exit 1
   when no files of a given type were staged, aborting the hook. Changed
   all filter pipes to process substitution with || true so no-match is
   handled gracefully.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TP4EGbBg3XMcyF28Lx78XJ
This commit is contained in:
2026-06-20 21:53:24 +00:00
parent ce673ca5e2
commit e5a08ebb45
2 changed files with 14 additions and 8 deletions

View File

@@ -44,6 +44,7 @@ write_block() {
fi
printf '\n%s\n%s\n%s\n' "$MARKER" "$block_content" "$END_MARKER" >> "$hook_file"
chmod +x "$hook_file"
}
ensure_hook() {
@@ -85,40 +86,40 @@ staged=$(git diff --cached --name-only --diff-filter=ACM)
# shellcheck on staged .sh files
if command -v shellcheck &>/dev/null; then
echo "$staged" | grep '\.sh$' | while IFS= read -r f; do
while IFS= read -r f; do
[[ -f "$f" ]] && shellcheck "$f"
done
done < <(echo "$staged" | grep '\.sh$' || true)
else
echo "Warning: shellcheck not installed — shell script linting skipped" >&2
fi
# jq validation on staged .json files
if command -v jq &>/dev/null; then
echo "$staged" | grep '\.json$' | while IFS= read -r f; do
while IFS= read -r f; do
[[ -f "$f" ]] && jq . "$f" > /dev/null
done
done < <(echo "$staged" | grep '\.json$' || true)
else
echo "Warning: jq not installed — JSON validation skipped" >&2
fi
# yq validation on staged .yaml/.yml files
if command -v yq &>/dev/null; then
echo "$staged" | grep -E '\.(yaml|yml)$' | while IFS= read -r f; do
while IFS= read -r f; do
[[ -f "$f" ]] && yq eval '.' "$f" > /dev/null
done
done < <(echo "$staged" | grep -E '\.(yaml|yml)$' || true)
else
echo "Warning: yq not installed — YAML validation skipped" >&2
fi
# SKILL.md frontmatter: must have name: and description:
echo "$staged" | grep 'SKILL\.md$' | while IFS= read -r f; do
while IFS= read -r f; do
if [[ -f "$f" ]]; then
if ! grep -q '^name:' "$f" || ! grep -q '^description' "$f"; then
echo "ERROR: $f is missing required frontmatter fields (name: and description:)" >&2
exit 1
fi
fi
done
done < <(echo "$staged" | grep 'SKILL\.md$' || true)
BLOCK
}