From 43a42bf4e7c27fdd787545d22dd5f9d48cf030ee Mon Sep 17 00:00:00 2001
From: Craig Cornelius <cwcornelius@gmail.com>
Date: Fri, 1 May 2026 12:12:05 -0700
Subject: [PATCH 1/2] Add Maven setup for macOS

---
 run_config.json |  2 +-
 setup_macos.sh  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/run_config.json b/run_config.json
index e57cec16..36921c22 100644
--- a/run_config.json
+++ b/run_config.json
@@ -27,7 +27,7 @@
     "prereq": {
       "name": "Get ICU4C 78",
       "version": "78.1",
-      "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.1-Ubuntu22.04-x64.tgz icu4c-78.1-src.tgz"
+      "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.1-Ubuntu22.04-x64.tgz icu4c-78.1-sources.tgz"
     },
     "run": {
       "icu_version": "icu78",
diff --git a/setup_macos.sh b/setup_macos.sh
index 022a1a4f..da4f21f0 100755
--- a/setup_macos.sh
+++ b/setup_macos.sh
@@ -14,6 +14,11 @@ if ! brew list json-c >/dev/null 2>&1; then
     brew install json-c
 fi
 
+# Check if Maven is already installed via Homebrew
+if ! brew list maven >/dev/null 2>&1; then
+    brew install maven
+fi
+
 # Download ICU4C binaries if the cache directory doesn't exist
 if [[ ! -d gh-cache ]]
 then
@@ -112,6 +117,13 @@ function download_77_1() {
   fi
 }
 
+function download_78_1() {
+  if [[ ! -f icu4c-78.1-sources.tgz ]]
+  then
+    curl -L -O https://github.com/unicode-org/icu/releases/download/release-78.1/icu4c-78.1-sources.tgz
+  fi
+}
+
 pushd gh-cache
 
 download_71_1
@@ -122,5 +134,6 @@ download_74_2
 download_75_1
 download_76_1
 download_77_1
+download_78_1
 
 popd
\ No newline at end of file

From c08a4fe1c7d5c94b15fc6e9b3c4d747b64a44cf2 Mon Sep 17 00:00:00 2001
From: Craig Cornelius <cwcornelius@gmail.com>
Date: Fri, 1 May 2026 13:40:36 -0700
Subject: [PATCH 2/2] Check for packages via `command` to allow for other
 preinstall modes

---
 setup_macos.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup_macos.sh b/setup_macos.sh
index da4f21f0..c941b3ed 100755
--- a/setup_macos.sh
+++ b/setup_macos.sh
@@ -10,12 +10,12 @@ if ! command -v brew >/dev/null 2>&1; then
 fi
 
 # Check if json-c is already installed via Homebrew
-if ! brew list json-c >/dev/null 2>&1; then
+if ! command -v json-c >/dev/null 2>&1; then
     brew install json-c
 fi
 
 # Check if Maven is already installed via Homebrew
-if ! brew list maven >/dev/null 2>&1; then
+if ! command -v mvn >/dev/null 2>&1; then
     brew install maven
 fi
 
@@ -39,7 +39,7 @@ if [[ ${error_code:-0} -ne 0 ]]
 then
     # On Mac, `enum` is a standard built-in library for Python 3.4+.
     # If this fails, the system Python is likely broken or too old, so we install a fresh python3.
-    if ! brew list python3 >/dev/null 2>&1; then
+    if ! command -v python3 >/dev/null 2>&1; then
         brew install python3
     fi
 fi