From 9286e0002d27b9b5fc2deb88285bf6766499a331 Mon Sep 17 00:00:00 2001
From: Yuchen Shi <yuchenshi@google.com>
Date: Tue, 3 Sep 2024 11:25:06 -0700
Subject: [PATCH] Fix install.sh refusing to download macos-arm64 standalone.
 (#6968)

* Fix install.sh refusing to download macos-arm64 standalone.

* Update tests for macos-arm64 and amd64.
---
 install.sh                |  6 +++---
 test/scripts/install.bats | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index fd44adb2a..81c1ce68e 100755
--- a/install.sh
+++ b/install.sh
@@ -461,9 +461,9 @@ npm_fallback() {
 # Determine if we have standalone releases on GitHub for the system's arch.
 has_standalone() {
   case $ARCH in
-    amd64) return 0 ;;
-    # We only have amd64 for macOS.
-    arm64)
+    arm64) return 0 ;;
+    # We only have arm64 for macOS.
+    amd64)
       [ "$(distro)" != macos ]
       return
       ;;
diff --git a/test/scripts/install.bats b/test/scripts/install.bats
index 976069cd4..67e64c919 100644
--- a/test/scripts/install.bats
+++ b/test/scripts/install.bats
@@ -132,15 +132,15 @@ function should-use-standalone() {
 
 # macOS use homebrew but falls back to standalone when brew is unavailable then
 # to npm for unsupported architectures.
-@test "$SCRIPT_NAME: macos arm64 (no brew)" {
-  should-fallback-npm-brew "arm64"
-}
 @test "$SCRIPT_NAME: macos amd64 (no brew)" {
-  BREW_PATH= OS=macos ARCH=amd64 run "$SCRIPT" --dry-run
+  should-fallback-npm-brew "amd64"
+}
+@test "$SCRIPT_NAME: macos arm64 (no brew)" {
+  BREW_PATH= OS=macos ARCH=arm64 run "$SCRIPT" --dry-run
   [ "$status" -eq 0 ]
   [ "${lines[1]}" = "Homebrew not installed." ]
   [ "${lines[2]}" = "Falling back to standalone installation." ]
-  [ "${lines[3]}" = "Installing v$VERSION of the amd64 release from GitHub." ]
+  [ "${lines[3]}" = "Installing v$VERSION of the arm64 release from GitHub." ]
   [[ "${lines[-6]}" = "Standalone release has been installed"* ]]
 }
 @test "$SCRIPT_NAME: macos i386 (no brew)" {