build order and brew activation

Author: mhfs

lib/packages_setup.sh

@@ -8,6 +8,16 @@ fmt_header "Package Manager"
 
 case "$OS" in
   macos)
+    # Activate Homebrew for this session if it exists but isn't on PATH yet.
+    # This covers re-runs in the same terminal before the shell RC is sourced.
+    if ! cmd_exists brew; then
+      if [ -f /opt/homebrew/bin/brew ]; then
+        eval "$(/opt/homebrew/bin/brew shellenv)"
+      elif [ -f /usr/local/bin/brew ]; then
+        eval "$(/usr/local/bin/brew shellenv)"
+      fi
+    fi
+
     if cmd_exists brew; then
       fmt_ok "Homebrew already installed"
     else

setup.sh

@@ -128,6 +128,9 @@ source "$SCRIPT_DIR/lib/packages_setup.sh"
 # shellcheck source=lib/git_setup.sh
 source "$SCRIPT_DIR/lib/git_setup.sh"
 
+# shellcheck source=lib/build_setup.sh
+source "$SCRIPT_DIR/lib/build_setup.sh"
+
 # shellcheck source=lib/mise_setup.sh
 source "$SCRIPT_DIR/lib/mise_setup.sh"
 
@@ -137,9 +140,6 @@ source "$SCRIPT_DIR/lib/1password_setup.sh"
 # shellcheck source=lib/circleci_setup.sh
 source "$SCRIPT_DIR/lib/circleci_setup.sh"
 
-# shellcheck source=lib/build_setup.sh
-source "$SCRIPT_DIR/lib/build_setup.sh"
-
 # shellcheck source=lib/docker_setup.sh
 source "$SCRIPT_DIR/lib/docker_setup.sh"