From 23cfa34abc8664987d2ed44f4a788c836779bbac Mon Sep 17 00:00:00 2001
From: Adam Getchell <acgetchell@ucdavis.edu>
Date: Tue, 5 Nov 2024 13:16:02 -0800
Subject: [PATCH] ci: CodeRabbit suggestions

---
 .appveyor.yml               |  4 ++--
 .github/workflows/macos.yml | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7e9aa6cd7..787b2512d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -19,8 +19,8 @@ clone_script:
       && git submodule update --init --recursive
 
 environment:
-  APPVEYOR_SAVE_CACHE_ON_ERROR : false
-  APPVEYOR_CACHE_SKIP_RESTORE : true
+  APPVEYOR_SAVE_CACHE_ON_ERROR: false
+  APPVEYOR_CACHE_SKIP_RESTORE: true
   VCPKG_DEFAULT_TRIPLET: x64-windows
   VCPKG_ROOT: c:\tools\vcpkg
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 140a60b11..9ef506ae1 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -19,10 +19,20 @@ jobs:
     - name: Setup
       run: |
         # Remove Python symlinks if they exist
-        for file in \
-          /usr/local/bin/{2to3,idle3,pydoc3,python3,python3-config}{,-3.11,-3.12}; do
-          [ -L "$file" ] && sudo rm "$file" || true
+        declare -a python_files=("2to3" "idle3" "pydoc3" "python3" "python3-config")
+        declare -a python_versions=("3.11" "3.12")
+        echo "Checking and removing Python symlinks..."
+        for base in "${python_files[@]}"; do
+          for version in "${python_versions[@]}"; do
+            file="/usr/local/bin/${base}${version}"
+            [ -L "$file" ] && sudo rm "$file" || true
+          done
         done
+        echo "Python symlink cleanup completed."
+#        for file in \
+#          /usr/local/bin/{2to3,idle3,pydoc3,python3,python3-config}{,-3.11,-3.12}; do
+#          [ -L "$file" ] && sudo rm "$file" || true
+#        done
         brew install automake autoconf autoconf-archive libtool texinfo yasm ninja python ccache pkg-config
 
     - name: Restore artifacts or setup vcpkg