pull ruby build

bin/node-build

@@ -732,19 +732,13 @@ build_package_autoconf() {
   } >&4 2>&1
 }
 
-clean_prefix_path() {
-  # Make sure there are no leftover files in $PREFIX_PATH
-  rm -rf "$PREFIX_PATH"
-}
-
 build_package_copy_to() {
   to="$1"
   mkdir -p "$to"
   cp -fR . "$to"
 }
 
 build_package_copy() {
-  clean_prefix_path
   build_package_copy_to "$PREFIX_PATH"
 }
 

test/test_helper.bash

@@ -23,13 +23,15 @@ fi
 
 remove_commands_from_path() {
   local path cmd
-  local paths=( $(command -v "$@" | sed 's!/[^/]*$!!' | sort -u) )
   local NEWPATH=":$PATH:"
-  for path in "${paths[@]}"; do
-    local tmp_path="$(mktemp -d "$BATS_TMPDIR/path.XXXXX")"
-    ln -fs "$path"/* "$tmp_path/"
-    for cmd; do rm -f "$tmp_path/$cmd"; done
-    NEWPATH="${NEWPATH/:$path:/:$tmp_path:}"
+  while PATH="${NEWPATH#:}" command -v "$@" >/dev/null; do
+    local paths=( $(PATH="${NEWPATH#:}" command -v "$@" | sed 's!/[^/]*$!!' | sort -u) )
+    for path in "${paths[@]}"; do
+      local tmp_path="$(mktemp -d "$TMP/path.XXXXX")"
+      ln -fs "$path"/* "$tmp_path/"
+      for cmd; do rm -f "$tmp_path/$cmd"; done
+      NEWPATH="${NEWPATH/:$path:/:$tmp_path:}"
+    done
   done
   echo "${NEWPATH#:}"
 }