More

Author: brentleyjones

examples/integration/tools/bazel

@@ -18,24 +18,33 @@ resolve_global_bazel() {
   ppid="$(ps -o ppid= $$)"
   ppid="${ppid// /}"
   parent_comm="$(ps -ewwo comm= "$ppid" 2>/dev/null || true)"
+  parent_comm="${parent_comm#"${parent_comm%%[![:space:]]*}"}"
   parent_name="${parent_comm##*/}"
 
-  for candidate in "$parent_name" bazelisk bazel; do
+  case "$parent_name" in
+    bazel|bazelisk)
+      if [[ -x "$parent_comm" && "$parent_comm" != "$tool_location" ]]; then
+        echo "$parent_comm"
+        return
+      fi
+      ;;
+  esac
+
+  for candidate in "$parent_name" bazelisk; do
     case "$candidate" in
       bazel|bazelisk) ;;
       *) continue ;;
     esac
 
-    if resolved_bazel=$(
-      env PATH=/opt/homebrew/bin:/usr/local/bin /usr/bin/which "$candidate" \
-        2>/dev/null
-    ); then
+    if resolved_bazel="$(type -P "$candidate" 2>/dev/null)" &&
+        [[ "$resolved_bazel" != "$tool_location" ]]
+    then
       echo "$resolved_bazel"
       return
     fi
   done
 
-  echo "Failed to find bazelisk or bazel on the global PATH" >&2
+  echo "Failed to find bazelisk on PATH" >&2
   exit 1
 }