From b4d19f680a6da1665f916fa393364766746a748b Mon Sep 17 00:00:00 2001 From: David Gwilliam Date: Wed, 24 Jun 2026 14:54:28 -0700 Subject: [PATCH] fix: ensure script executability on every pull git checkout/clone can lose +x bits. Move chmod to always run in post-merge hook, not just when scripts/ changes. --- .githooks/post-merge | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.githooks/post-merge b/.githooks/post-merge index 88bac9f..0e6ad96 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -9,6 +9,9 @@ if [ -z "$CHANGED" ]; then exit 0 fi +# Always ensure scripts are executable (git may lose +x on clone/checkout) +sudo chmod +x "$REPO/scripts/"*.py "$REPO/scripts/"*.sh 2>/dev/null || true + SYSTEMD_CHANGED=$(echo "$CHANGED" | grep -c "^system/" || true) SCRIPT_CHANGED=$(echo "$CHANGED" | grep -c "^scripts/" || true) SKETCH_CHANGED=$(echo "$CHANGED" | grep -c "^sketch/" || true)