chore(githooks): auto-configure hooks from installers; ensure scripts/*.sh executable; add CI check for executable shebangs

Author: JotaRandom

.githooks/pre-commit

@@ -1,31 +1,36 @@
 #!/usr/bin/env bash
-# Pre-commit hook: Ensure scripts under scripts/ with shebang become executable in the index
+# Cross-platform pre-commit hook: ensure scripts/*.sh are executable in the index
 set -euo pipefail
 
-# Get list of staged files (added/modified)
+# If PowerShell is available, run the PowerShell hook on Windows
+if command -v pwsh >/dev/null 2>&1; then
+  pwsh -ExecutionPolicy Bypass -File "$(git rev-parse --show-toplevel)/.githooks/pre-commit.ps1"
+  exit 0
+fi
+if command -v powershell >/dev/null 2>&1; then
+  powershell -ExecutionPolicy Bypass -File "$(git rev-parse --show-toplevel)/.githooks/pre-commit.ps1"
+  exit 0
+fi
+
+# Fallback: POSIX logic (for Bash)
 STAGED=$(git diff --cached --name-only --diff-filter=ACM)
-if [ -z "$STAGED" ]; then	exit 0
+if [ -z "$STAGED" ]; then
+  exit 0
 fi
 
 CHANGED=0
 for f in $STAGED; do
-  # Only consider files under scripts/
   case "$f" in
-    scripts/*)
+    scripts/*.sh)
       if [ -f "$f" ]; then
-        # If file has shebang, make it executable in the index
-        if head -n 1 "$f" | grep -q '^#!'; then
-          git update-index --chmod=+x "$f"
-          CHANGED=1
-        fi
+        git update-index --chmod=+x "$f" && CHANGED=1 || true
       fi
       ;;
   esac
 done
 
 if [ "$CHANGED" -eq 1 ]; then
-  echo "Fixed executable bit for staged scripts; the index has been updated."
-  # Keep commit proceeding. We changed the index, but the commit will include that change.
+  echo "Marked staged scripts/*.sh as executable in index"
 fi
 
 exit 0

.githooks/pre-commit.ps1

@@ -0,0 +1,21 @@
+# PowerShell pre-commit hook: ensure scripts/*.sh are executable in the index
+param()
+
+# Get staged files
+$staged = git diff --cached --name-only --diff-filter=ACM
+if (-not $staged) { exit 0 }
+
+$changed = $false
+foreach ($f in $staged) {
+    if ($f -like 'scripts/*.sh') {
+        if (Test-Path $f) {
+            # Set the executable bit in git index
+            git update-index --chmod=+x $f
+            $changed = $true
+        }
+    }
+}
+if ($changed) {
+    Write-Host "Marked staged scripts/*.sh as executable in index"
+}
+exit 0

.github/workflows/ci.yml

@@ -22,6 +22,23 @@ jobs:
       - name: Bash syntax check
         run: |
           for f in ./scripts/*.sh; do bash -n "$f"; done
+      - name: Check executable bit on shebang scripts
+        run: |
+          set -e
+          fail=0
+          files=$(git ls-files -- "scripts/*.sh" || true)
+          if [ -n "$files" ]; then
+            for f in $files; do
+              if head -n1 "$f" | grep -q '^#!'; then
+                mode=$(git ls-files --stage "$f" | awk '{print $1}')
+                if [ "$mode" != "100755" ]; then
+                  echo "$f has shebang but is not executable in index (mode: $mode). Run: git update-index --chmod=+x $f"
+                  fail=1
+                fi
+              fi
+            done
+          fi
+          if [ "$fail" -eq 1 ]; then exit 1; fi
       - name: Run shellcheck
         run: |
           for f in ./scripts/*.sh; do shellcheck "$f" || true; done

README.md

@@ -89,7 +89,9 @@ Para más detalles y alternativas (subtree, CI, etc), revisa `docs/INSTALL.md` y
 	```
 Nota: El instalador `./scripts/install.sh` aplica solo dotfiles de usuario en `$HOME` (stow), y no modifica archivos de sistema como `/etc/*`. Para cambios a nivel sistema aplica los archivos manualmente con permisos root según las instrucciones en `docs/INSTALL.md`.
 
-Desarrolladores: Si quieres que los hooks locales se activen automáticamente en tu clone, ejecuta:
+Desarrolladores: Los instaladores `scripts/install.sh` y `scripts/install.ps1` configuran automáticamente `core.hooksPath` a `.githooks`
+en tu copia local del repositorio cuando se ejecutan (esto es seguro y idempotente). Si prefieres configurarlo manualmente en vez de
+ejecutar el instalador, puedes correr:
 
 ```bash
 ./scripts/setup-githooks.sh

docs/INSTALL.md

@@ -34,16 +34,19 @@ Precauciones:
 1. Copiar `modules/system/etc/X11/*.conf` a `/etc/X11/xorg.conf.d/`.
 2. Reinicia la sesión gráfica tras copiar el archivo a /etc/X11/xorg.conf.d/.
 
-## Hooks Git (Opcional)
-Este repositorio incluye un hook pre-commit en `.githooks/pre-commit` que asegura que los archivos dentro
+## Hooks Git (automático)
+Este repositorio incluye un pre-commit hook en `.githooks/pre-commit` que asegura que los archivos dentro
 de `scripts/` con un shebang (`#!`) reciban el bit de ejecución (`+x`) en el índice al hacer commit, para evitar
-problemas en plataformas Unix. Para activar los hooks en tu copia local ejecuta:
+problemas en plataformas Unix.
+
+Los instaladores `scripts/install.sh` y `scripts/install.ps1` ejecutarán automáticamente `scripts/setup-githooks.*`
+si se ejecutan en una copia del repositorio (es idempotente y seguro). Si prefieres configurarlo manualmente, ejecuta:
 
 ```bash
 ./scripts/setup-githooks.sh
 ```
 
-Después de ejecutar el script, el hook correrá localmente antes de cada commit. Si deseas revertir este cambio:
+Para revertir la configuración en tu copia local:
 ```bash
 git config --unset core.hooksPath
 ```

scripts/install.ps1

@@ -35,3 +35,15 @@ foreach ($module in $Modules) {
 }
 
 Write-Host "Instalación (PowerShell) finalizada. Revisa los enlaces simbólicos." -ForegroundColor Cyan
+
+# Auto-configure Git hooks in this repository (safe and idempotent)
+try {
+    $null = git rev-parse --is-inside-work-tree 2>$null
+    $setupPath = Join-Path $PSScriptRoot 'setup-githooks.ps1'
+    if (Test-Path $setupPath) {
+        Write-Host "Configurando hooks de git localmente (core.hooksPath -> .githooks)" -ForegroundColor Cyan
+        try { & $setupPath } catch { Write-Warning "No se pudo configurar hooks de git: $_" }
+    }
+} catch {
+    # Not a git repository or git not available; ignore
+}

scripts/install.sh

@@ -74,3 +74,14 @@ done
 echo "Instalación finalizada. Este instalador solo aplica dotfiles de usuario en \\${HOME}."
 echo "Si necesitas aplicar cambios a nivel sistema (Xorg, etc.), hazlo manualmente con permisos de root."
 echo "Recuerda revisar los archivos instalados para asegurarte de que todo esté como deseas."
+ 
+# Auto-configure git hooks (if available) — this is safe and idempotent and only affects local git config
+if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+  REPO_ROOT=$(git rev-parse --show-toplevel)
+  SETUP_SCRIPT="$REPO_ROOT/scripts/setup-githooks.sh"
+  if [ -f "$SETUP_SCRIPT" ]; then
+    echo "Configurando hooks de git localmente (core.hooksPath -> .githooks)"
+    # run setup script, ignore errors (non-fatal)
+    "$SETUP_SCRIPT" || true
+  fi
+fi

scripts/setup-githooks.ps1

@@ -0,0 +1,24 @@
+# PowerShell setup to configure Git hooks path
+param()
+
+if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
+    Write-Error "git not found"
+    exit 1
+}
+
+git config core.hooksPath .githooks
+Write-Host "core.hooksPath set to .githooks"
+
+# Make sure the Windows scripts are executable in index (call the PS pre-commit logic)
+# Only set execute bit for scripts with a shebang
+$files = git ls-files "scripts/*.sh" 2>$null
+foreach ($f in $files) {
+    if (Test-Path $f) {
+        $firstLine = Get-Content -Path $f -TotalCount 1 -ErrorAction SilentlyContinue
+        if ($firstLine -and $firstLine -match '^#!') {
+            git update-index --chmod=+x $f
+        }
+    }
+}
+
+Write-Host "Updated git index for scripts/*.sh to be executable (if present)."

scripts/setup-githooks.sh

@@ -10,3 +10,15 @@ fi
 git config core.hooksPath .githooks
 
 echo "Configured Git hooks path to '.githooks' in this repository. If you want to revert, do: git config --unset core.hooksPath"
+
+# Ensure scripts/*.sh with a shebang are executable in the index (idempotent)
+if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+  for f in $(git ls-files "scripts/*.sh" 2>/dev/null || true); do
+    if [ -f "$f" ]; then
+      if head -n 1 "$f" | grep -q '^#!'; then
+        git update-index --chmod=+x "$f" || true
+      fi
+    fi
+  done
+  echo "Ensured executable bit is set for scripts/*.sh with a shebang in the git index."
+fi