From 28301be914dec6da5d1bbd21cd8511cd71b419ee Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Tue, 17 Nov 2020 12:42:57 +0100
Subject: [PATCH] Squashed 'gitstatus/' changes from cb363c77..90cbb46b
90cbb46b s/darwin-aarch64/darwin-arm64/ (#188)
git-subtree-dir: gitstatus
git-subtree-split: 90cbb46b7b185dc95ab96301ec49754f7e801395
---
install.info | 2 +-
mbuild | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/install.info b/install.info
index 6f598962..2f9c2e2f 100644
--- a/install.info
+++ b/install.info
@@ -25,7 +25,7 @@ uname_s_glob="msys_nt-10.0"; uname_m_glob="x86_64"; file="gitstatusd-${uname_
# Fallbacks to official gitstatusd binaries.
uname_s_glob="cygwin_nt-*"; uname_m_glob="i686"; file="gitstatusd-cygwin_nt-10.0-${uname_m}"; version="v1.3.1"; sha256="c96baef70b81b5a1d46adcc9e93721eaf4bdc295562bdd2baf210a6b416b9911";
uname_s_glob="cygwin_nt-*"; uname_m_glob="x86_64"; file="gitstatusd-cygwin_nt-10.0-${uname_m}"; version="v1.3.1"; sha256="18b5be49f6eb9ff1cf25e76d6f2333c7402e686e05ce5b88ca107c80504210d8";
-uname_s_glob="darwin"; uname_m_glob="aarch64"; file="gitstatusd-${uname_s}-x86_64"; version="v1.3.1"; sha256="26d582fe9a0b2090c28e84e5e32a6d42d6988cedff51e41ec5f789512c53b0fc";
+uname_s_glob="darwin"; uname_m_glob="arm64"; file="gitstatusd-${uname_s}-x86_64"; version="v1.3.1"; sha256="26d582fe9a0b2090c28e84e5e32a6d42d6988cedff51e41ec5f789512c53b0fc";
uname_s_glob="mingw32_nt-*"; uname_m_glob="i686"; file="gitstatusd-msys_nt-10.0-${uname_m}"; version="v1.3.1"; sha256="618d2425c6a22fa3762fe6fe252f9ddb4ed9138df1377e48b2f119cd4875f400";
uname_s_glob="mingw32_nt-*"; uname_m_glob="x86_64"; file="gitstatusd-msys_nt-10.0-${uname_m}"; version="v1.3.1"; sha256="bdfae7a7c0fd83d0214a7eabde3b7d8709336bd08697a74d48bea4a04c352676";
uname_s_glob="mingw64_nt-*"; uname_m_glob="i686"; file="gitstatusd-msys_nt-10.0-${uname_m}"; version="v1.3.1"; sha256="618d2425c6a22fa3762fe6fe252f9ddb4ed9138df1377e48b2f119cd4875f400";
diff --git a/mbuild b/mbuild
index b6f220e0..02408802 100755
--- a/mbuild
+++ b/mbuild
@@ -181,10 +181,10 @@ local build='
function build-unix() {
local intro flags=(-sw)
case $2 in
- linux-ppc64le) ;;
- linux-*) flags+=(-d docker);;
- darwin-aarch64) intro='PATH="/opt/homebrew/bin:$PATH"';;
- darwin-*) intro='PATH="/usr/local/bin:$PATH"';;
+ linux-ppc64le) ;;
+ linux-*) flags+=(-d docker);;
+ darwin-arm64) intro='PATH="/opt/homebrew/bin:$PATH"';;
+ darwin-*) intro='PATH="/usr/local/bin:$PATH"';;
esac
ssh $1 -- /bin/sh -uex <<<"
$intro