fix: enable avalanche_golangci_lint hook

Author: powerslider

.pre-commit-config.yaml

@@ -33,15 +33,13 @@ repos:
   # Local utility scripts and full repo checks
   - repo: local
     hooks:
-      # TODO: Re-enable this once we have a way to run the extra lints in CI.
-      # See https://github.com/ava-labs/coreth/pull/1117
-      # # Stricter extra lints (golangci-lint v2) on staged changes at pre-commit
-      # - id: extra-golangci-lint
-      #   name: golangci-lint (extra via scripts/lint.sh)
-      #   entry: bash -lc 'TESTS="extra_golangci_lint" scripts/lint.sh'
-      #   language: system
-      #   stages: [pre-commit]
-      #   pass_filenames: false
+      # Stricter extra lints (golangci-lint v2) on staged changes at pre-commit
+      - id: extra-golangci-lint
+        name: golangci-lint (extra via scripts/lint.sh)
+        entry: bash -lc 'TESTS="avalanche_golangci_lint" scripts/lint.sh'
+        language: system
+        stages: [pre-commit]
+        pass_filenames: false
 
       - id: actionlint
         name: actionlint

scripts/lint.sh

@@ -7,16 +7,62 @@ if ! [[ "$0" =~ scripts/lint.sh ]]; then
   exit 255
 fi
 
-# The -P option is not supported by the grep version installed by
-# default on macos. Since `-o errexit` is ignored in an if
-# conditional, triggering the problem here ensures script failure when
-# using an unsupported version of grep.
-grep -P 'lint.sh' scripts/lint.sh &>/dev/null || (
+# Darwin-specific environment handling: ensure Bash 4+ and GNU grep availability.
+function handle_darwin_environment_specifics {
+  # Re-exec with Homebrew bash when system bash is < 4 (macOS default 3.2)
+  if ! { test -n "${BASH_VERSINFO:-}" && [ "${BASH_VERSINFO[0]}" -ge 4 ]; }; then
+    for _brew_bash in "/opt/homebrew/bin/bash" "/usr/local/bin/bash"; do
+      if [[ -x "${_brew_bash}" ]]; then
+        exec "${_brew_bash}" "$0" "$@"
+      fi
+    done
+    echo >&2 "error: This script requires bash >= 4. On macOS, install with:  brew install bash"
+    echo >&2 "       Then ensure Homebrew bash is used first in PATH or re-run via: /opt/homebrew/bin/bash scripts/lint.sh"
+    exit 255
+  fi
+
+  # Prefer ggrep when available; make a shim so plain `grep` resolves to it
+  if command -v ggrep >/dev/null 2>&1; then
+    if ggrep -P 'lint.sh' scripts/lint.sh &>/dev/null; then
+      _gnu_grep_shim_dir="$(mktemp -d)"
+      ln -s "$(command -v ggrep)" "${_gnu_grep_shim_dir}/grep" 2>/dev/null || true
+      export PATH="${_gnu_grep_shim_dir}:$PATH"
+    fi
+  fi
+
+  # Try Homebrew gnubin via brew and well-known locations
+  if command -v brew >/dev/null 2>&1; then
+    local gnubin_dir
+    gnubin_dir="$(brew --prefix grep 2>/dev/null)/libexec/gnubin"
+    if [[ -d "$gnubin_dir" ]]; then
+      export PATH="$gnubin_dir:$PATH"
+    fi
+  fi
+  for d in \
+    "/opt/homebrew/opt/grep/libexec/gnubin" \
+    "/usr/local/opt/grep/libexec/gnubin"; do
+    if [[ -d "$d" ]]; then
+      export PATH="$d:$PATH"
+    fi
+  done
+}
+
+# Run Darwin adjustments early if applicable
+if [[ "$(uname -s)" == "Darwin" ]]; then
+  handle_darwin_environment_specifics "$@"
+fi
+
+# Final probe; fail hard if still unsupported
+if ! grep -P 'lint.sh' scripts/lint.sh &>/dev/null; then
   echo >&2 "error: This script requires a recent version of gnu grep."
-  echo >&2 "       On macos, gnu grep can be installed with 'brew install grep'."
-  echo >&2 "       It will also be necessary to ensure that gnu grep is available in the path."
+  if [[ "$(uname -s)" == "Darwin" ]]; then
+    echo >&2 "       On macOS, install with:  brew install grep"
+    echo >&2 "       Ensure gnubin is on PATH, e.g.:"
+    echo >&2 "         export PATH=\"/opt/homebrew/opt/grep/libexec/gnubin:\$PATH\"  # Apple Silicon"
+    echo >&2 "         export PATH=\"/usr/local/opt/grep/libexec/gnubin:\$PATH\"     # Intel"
+  fi
   exit 255
-)
+fi
 
 # Read excluded directories into arrays
 DEFAULT_FILES=()