From 9609a835ca2eb3089e35269a05369833e9ec0ba2 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Mon, 21 Dec 2020 16:19:22 +0100
Subject: Squashed 'gitstatus/' changes from 630915cc..6d00edd0
6d00edd0 use a native binary on darwin-arm64
4994f160 add a build server for darwin-arm64
0e922813 invoke port with sudo
576571c7 support macports in addition to homebrew when building on macos
b476570a remove trailing whitespace
git-subtree-dir: gitstatus
git-subtree-split: 6d00edd0bfd1d65a3cbcebfc6e679e8c43726acc
---
install | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
(limited to 'install')
diff --git a/install b/install
index 23501b9c..86824ece 100755
--- a/install
+++ b/install
@@ -5,24 +5,6 @@
_gitstatus_install_daemon_found() {
local installed="$1"
shift
-
- case "$daemon" in
- *-darwin-x86_64)
- if [ "$uname_m" = arm64 ] &&
- [ ! -e /Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist ] &&
- [ -x /usr/sbin/softwareupdate ]; then
- >&"$e" printf 'Please run the following command to install Rosetta:\n'
- >&"$e" printf '\n'
- >&"$e" printf ' \033[32m/usr/sbin/softwareupdate\033[0m --install-rosetta\n'
- >&"$e" printf '\n'
- >&"$e" printf 'See for details: \033[4mhttps://support.apple.com/en-us/HT211861\033[0m\n'
- >&"$e" printf '\n'
- >&"$e" printf 'Once Rosetta is installed, restart your shell.\n'
- return 1
- fi
- ;;
- esac
-
[ $# = 0 ] || "$@" "$daemon" "$version" "$installed"
}
@@ -386,9 +368,9 @@ END
local trapped=
trap 'trapped=1' $sig
- fetch 1 "$url1" &
+ fetch 1 "$url1" &
local pid1="$!"
- fetch 2 "$url2" &
+ fetch 2 "$url2" &
local pid2="$!"
local die="trap - $sig; kill -- $pid1 $pid2 2>/dev/null; wait -- $pid1 $pid2 2>/dev/null; exit 1"
--
cgit v1.2.3