From 8a939a821fab7bcf56a9e1e1aaf3656a3c21fb9b Mon Sep 17 00:00:00 2001 From: Chris Araman Date: Mon, 25 Oct 2021 16:46:56 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=BA=20Include=20Monterey=20in=20bottle?= =?UTF-8?q?=20builds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/bottle | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/script/bottle b/script/bottle index f163bc0..66c7cbc 100755 --- a/script/bottle +++ b/script/bottle @@ -17,8 +17,8 @@ BOTTLE_DIR="$BUILD_DIR/bottles" VERSION=$(script/version) ROOT_URL="https://github.com/mas-cli/mas/releases/download/v${VERSION}" -# Supports macOS versions 11 (arm64 & x86_64), 10.15, 10.14, 10.13, 10.12, 10.11 -OS_NAMES=(arm64_big_sur big_sur catalina mojave high_sierra sierra el_capitan) +# Supports macOS 10.11 and later +OS_NAMES=(arm64_monterey monterey arm64_big_sur big_sur catalina mojave high_sierra sierra el_capitan) # Semantic version number split into a list using Ugly, bash 3 compatible syntax IFS=" " read -r -a CURRENT_OS_VERSION <<<"$(sw_vers -productVersion | sed 's/\./ /g'))" @@ -28,7 +28,13 @@ CURRENT_OS_VERSION_MINOR=${CURRENT_OS_VERSION[1]} echo "CURRENT_OS_VERSION_MAJOR: $CURRENT_OS_VERSION_MAJOR" echo "CURRENT_OS_VERSION_MINOR: $CURRENT_OS_VERSION_MINOR" -if [[ ${CURRENT_OS_VERSION_MAJOR} == "11" ]]; then +if [[ ${CURRENT_OS_VERSION_MAJOR} == "12" ]]; then + if [[ "x86_64" == "$(uname -m)" ]]; then + CURRENT_PLATFORM=monterey + else + CURRENT_PLATFORM=arm64_monterey + fi +elif [[ ${CURRENT_OS_VERSION_MAJOR} == "11" ]]; then # Big Sur if [[ "x86_64" == "$(uname -m)" ]]; then CURRENT_PLATFORM=big_sur