Bob for Tim's latest apple and bite it off

Author: workingjubilee

src/ci/scripts/select-xcode.sh

@@ -1,11 +1,22 @@
 #!/bin/bash
 # This script selects the Xcode instance to use.
 
-set -euo pipefail
+set -euox pipefail
 IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isMacOS; then
+    old_xcode="$(xcode-select --print-path)"
+    if [[ $old_xcode =~ $SELECT_XCODE ]]; then
+        echo "xcode-select.sh's brutal hack may not be necessary?"
+        exit 1
+    elif [[ $SELECT_XCODE =~ "16" ]]
+    else
+        sudo xcode-select -s "16.0.0"
+        xcode_16_path="$(xcode-select --print-path)"
+        sudo rm -rf "${xcode_16_path}/../../"
+    fi
+    sudo rm -rf "${old_xcode}/../../"
     sudo xcode-select -s "${SELECT_XCODE}"
 fi