From 93d716d954a1f55a49e9d4b5b6fefa0cd05c8d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20B=C3=BChler?= <48823479+adibue@users.noreply.github.com> Date: Wed, 23 Jun 2021 22:53:22 +0200 Subject: [PATCH 1/2] Got 'mattermost' ready for Apple Silicon `mattermost` can now distinguish between Intel and Apple Silicon. --- Installomator.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Installomator.sh b/Installomator.sh index 4f77c53..7014e08 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1938,7 +1938,13 @@ malwarebytes) mattermost) name="Mattermost" type="dmg" - downloadURL=$(downloadURLFromGit mattermost desktop) + if [[ $(arch) == i386 ]]; then + downloadURL=$(curl --silent --fail "https://api.github.com/repos/mattermost/desktop/releases/latest" \ + | awk -F '"' "/browser_download_url/ && /mac.dmg/ && ! /blockmap/ { print \$4 }") + elif [[ $(arch) == arm64 ]]; then + downloadURL=$(curl --silent --fail "https://api.github.com/repos/mattermost/desktop/releases/latest" \ + | awk -F '"' "/browser_download_url/ && /mac-m1.dmg/ && ! /blockmap/ { print \$4 }") + fi appNewVersion=$(versionFromGit mattermost desktop ) expectedTeamID="UQ8HT4Q2XM" ;; From 2028abae59f32f75983a385856ae3d3ec6461425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20B=C3=BChler?= <48823479+adibue@users.noreply.github.com> Date: Tue, 6 Jul 2021 14:04:41 +0200 Subject: [PATCH 2/2] Improved 'mattermost' With `archiveName`, there's a way easier solution to make Intel/ARM downloads work with GitHub. Thanks to @acodega for bringing this to my attention. --- Installomator.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Installomator.sh b/Installomator.sh index 7014e08..65bfe87 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1939,12 +1939,11 @@ mattermost) name="Mattermost" type="dmg" if [[ $(arch) == i386 ]]; then - downloadURL=$(curl --silent --fail "https://api.github.com/repos/mattermost/desktop/releases/latest" \ - | awk -F '"' "/browser_download_url/ && /mac.dmg/ && ! /blockmap/ { print \$4 }") + archiveName="mac.dmg" elif [[ $(arch) == arm64 ]]; then - downloadURL=$(curl --silent --fail "https://api.github.com/repos/mattermost/desktop/releases/latest" \ - | awk -F '"' "/browser_download_url/ && /mac-m1.dmg/ && ! /blockmap/ { print \$4 }") + archiveName="mac-m1.dmg" fi + downloadURL=$(downloadURLFromGit mattermost desktop) appNewVersion=$(versionFromGit mattermost desktop ) expectedTeamID="UQ8HT4Q2XM" ;;