fix: resolve cherry-pick conflicts

v4-next already superseded #20630's changes to aztec-up/bin/0.0.1/install
and aztec-up/bootstrap.sh (modern color palette, pinned node version,
guarded nvm source, _bg_pids, aztec-prefixed bin checks, test_macs), so
those two files are kept at the v4-next version. The remaining hunks
(aztec.sh inherit_errexit removal, barretenberg/ts cross_copy arg
pass-through, qemu-utils) are retained.

Author: AztecBot

aztec-up/bin/0.0.1/install

@@ -8,20 +8,12 @@
 set -euo pipefail
 
 # Colors
-<<<<<<< HEAD
 reset="\033[0m"
 g="\033[38;5;114m"              # green
 y="\033[38;5;222m"              # yellow
 b="\033[38;5;111m"              # blue
 p="\033[38;5;176m"              # purple
 r="\033[38;5;203m"            # red
-=======
-r="\033[31m" # Red
-g="\033[32m" # Green
-y="\033[33m" # Yellow
-b="\033[34m" # Blue
-reset="\033[0m"
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
 # Helper function to safely read version from versions file
 function get_version {
@@ -148,13 +140,8 @@ function install_node {
   fi
 
   . "$HOME/.nvm/nvm.sh"
-<<<<<<< HEAD
   nvm install "$node_min_version"
   nvm alias default "$node_min_version"
-=======
-  nvm install --lts
-  nvm alias default lts/*
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 }
 
 function install_versions_file {
@@ -332,13 +319,8 @@ function main {
   dump_fail install_node
   echo_green "done."
 
-<<<<<<< HEAD
   # Source nvm to ensure node is in PATH (if using nvm).
   [ -f "$HOME/.nvm/nvm.sh" ] && . "$HOME/.nvm/nvm.sh"
-=======
-  # Source nvm to ensure node is in PATH.
-  . "$HOME/.nvm/nvm.sh"
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
   # Install noir
   echo -n "Installing nargo... "

aztec-up/bootstrap.sh

@@ -166,14 +166,9 @@ function prep_test_mac {
   fi
 
   # Cleanup background processes on exit.
-<<<<<<< HEAD
   # Note: can't use local - the trap fires after function scope is gone.
   _bg_pids=()
   trap 'kill "${_bg_pids[@]}" &>/dev/null || true' EXIT
-=======
-  local pids=()
-  trap 'kill "${pids[@]}" &>/dev/null || true' EXIT
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
   # Start Verdaccio in offline mode (no uplinks), bound to all interfaces.
   cat > /tmp/verdaccio-mac-test.yaml <<EOF
@@ -195,21 +190,13 @@ logs: { type: stdout, format: pretty, level: warn }
 EOF
 
   verdaccio --config /tmp/verdaccio-mac-test.yaml --listen 0.0.0.0:$verdaccio_port &>/dev/null &
-<<<<<<< HEAD
   _bg_pids+=($!)
-=======
-  pids+=($!)
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
   while ! nc -z localhost $verdaccio_port &>/dev/null; do sleep 1; done
   echo "Verdaccio running on 0.0.0.0:$verdaccio_port"
 
   # Serve bin/ directory over HTTP to mimic S3-hosted install scripts.
   python3 -m http.server $http_port --directory ./bin --bind 0.0.0.0 &>/dev/null &
-<<<<<<< HEAD
   _bg_pids+=($!)
-=======
-  pids+=($!)
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
   while ! nc -z localhost $http_port &>/dev/null; do sleep 1; done
   echo "HTTP server running on 0.0.0.0:$http_port (serving ./bin/)"
 }
@@ -231,38 +218,24 @@ function install_on_mac_vm {
     # Point npm at local Verdaccio and scripts at local HTTP server.
     export npm_config_registry=http://$host_ip:$verdaccio_port
     export INSTALL_URI=http://$host_ip:$http_port
-<<<<<<< HEAD
     export INFRA_VERSION=0.0.1
     export NO_NEW_SHELL=1
-=======
-    export NO_NEW_SHELL=1
-    export NON_INTERACTIVE=1
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
     touch \$HOME/.zshrc
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash
     . "\$HOME/.nvm/nvm.sh"
 
     echo
     echo "Running aztec install script..."
-<<<<<<< HEAD
     bash <(curl -sL \$INSTALL_URI/0.0.1/aztec-install)
-=======
-    VERSION=0.0.1 bash <(curl -sL \$INSTALL_URI/0.0.1/aztec-install)
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
     # Fake fresh shell.
     export PATH="\$HOME/.aztec/current/bin:\$HOME/.aztec/current/node_modules/.bin:\$HOME/.aztec/bin:\$PATH"
     . "\$HOME/.nvm/nvm.sh"
 
     # Verify installation.
-<<<<<<< HEAD
     aztec-nargo --version
     aztec-bb --version
-=======
-    nargo --version
-    bb --version
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
     aztec --version
 REMOTE_EOF
 }
@@ -283,29 +256,20 @@ export -f install_on_mac_vm launch_and_install_on_mac_vm
 
 # Assumes a macos vm is already running.
 # Starts services, and runs install script on the mac vm via ssh.
-<<<<<<< HEAD
 function test_on_mac_vm {
   local mac_name="${1:?Mac vm name (e.g. 14)}"
   echo_header "aztec-up test_on_mac_vm"
-=======
-function test_mac {
-  echo_header "aztec-up test_mac"
-  local mac_name="${1:?Mac vm name (e.g. 14)}"
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
   prep_test_mac
   install_on_mac_vm $mac_name
 }
 
-<<<<<<< HEAD
 function test_mac {
   local mac_name="${1:?Mac vm name (e.g. 14)}"
   echo_header "aztec-up test_mac"
   prep_test_mac
   launch_and_install_on_mac_vm $mac_name
 }
 
-=======
->>>>>>> 44e1ce22abb (fix: some mac install fixes)
 # Starts services, launches a mac vm for each version and runs install script via ssh.
 function test_macs {
   echo_header "aztec-up test_macs"