From 7eda54a14194622dcea2f068d61ed1044b8ef9d2 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Fri, 16 Apr 2021 12:36:53 -0500
Subject: [PATCH] fix: don't run scripts/fetch-brew-bottle.sh in parallel

It's not supported to run `brew update` multiple times simultaenously. A better
fix for this can be implemented, but for now in the Makefile have target
`bottles/pcre` depend on target `bottles/openssl` so that they run serially
when `-jN` is passed to `make`.

I was originally going to change `brew update >/dev/null` to
`brew update >/dev/null || true` but decided the Makefile change provides a
better guarantee that simultaenous `brew` commands won't interfere with each
other. In the process, I revised some of the script's `echo` output just a bit.
---
 Makefile                     | 2 +-
 scripts/fetch-brew-bottle.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d5dd84da9e..fee6ba0d78 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ifeq ($(detected_OS),Darwin)
 bottles/openssl:
 	./scripts/fetch-brew-bottle.sh openssl
 
-bottles/pcre:
+bottles/pcre: bottles/openssl
 	./scripts/fetch-brew-bottle.sh pcre
 
 bottles: bottles/openssl bottles/pcre
diff --git a/scripts/fetch-brew-bottle.sh b/scripts/fetch-brew-bottle.sh
index 33a08b69e2..bab59e6870 100755
--- a/scripts/fetch-brew-bottle.sh
+++ b/scripts/fetch-brew-bottle.sh
@@ -21,7 +21,7 @@ function fetch_bottle() {
 }
 
 if [[ $(uname) != "Darwin" ]]; then
-    echo "This script is intended for use on MacOS!" >&2
+    echo "This script is intended for use on macOS!" >&2
     exit 1
 fi
 
@@ -37,7 +37,7 @@ GITHUB_USER="${GITHUB_USER:-_}"
 GITHUB_TOKEN="${GITHUB_TOKEN:-_}"
 if [[ "${GITHUB_USER}" == "_" ]] || [[ "${GITHUB_TOKEN}" == "_" ]]; then
     echo "No GITHUB_USER or GITHUB_TOKEN variable set!" >&2
-    echo "GitHub Packages which can throttle unauthorized requests." >&2
+    echo "GitHub Packages can throttle unauthorized requests." >&2
 else
     echo "${BOTTLE_NAME} - Fetching GH Pkgs Token"
     BEARER_TOKEN=$(get_gh_pkgs_token)
@@ -47,7 +47,7 @@ fi
 if [[ $(stat -f %u /usr/local/var/homebrew) -ne "${UID}" ]]; then
     echo "Missing permissions to update Homebrew formulae!" >&2
 else
-    echo "${BOTTLE_NAME} - Updateing HomeBrew repository"
+    echo "${BOTTLE_NAME} - Updating HomeBrew repository"
     brew update >/dev/null
 fi
 
@@ -56,7 +56,7 @@ BOTTLE_JSON=$(get_bottle_json "${BOTTLE_NAME}")
 BOTTLE_URL=$(echo "${BOTTLE_JSON}" | jq -r .url)
 BOTTLE_SHA=$(echo "${BOTTLE_JSON}" | jq -r .sha256)
 
-echo "${BOTTLE_NAME} - Fetching bottles for macOS"
+echo "${BOTTLE_NAME} - Fetching bottle for macOS"
 fetch_bottle "${BOTTLE_PATH}" "${BOTTLE_URL}"
 trap "rm -fr ${BOTTLE_PATH}" EXIT ERR INT QUIT