From 4faf5ed41e2fd2c3b749dd1dea0394aae19433e4 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Sun, 26 Feb 2023 22:51:04 -0800
Subject: [PATCH] Use Apple Silicon build artifact name required by
 electron-updater

The Arduino IDE update check uses a "channel update info file" on Arduino's download server. This file specifies the
latest version of Arduino IDE available from the Arduino download server as well as the download URLs for the release
archives.

There is a separate channel file for each host operating system:

- Windows
- Linux
- macOS

Two macOS host architectures are now supported:

- x86 (AKA "Intel")
- ARM64 (AKA "Apple Silicon")

These each have their own release archive files. The macOS channel file contains data on both. So the updater must be
able to identify the appropriate archive to use for the update based on the host architecture. This is based on the
archive filename.

Arduino IDE's auto-update feature is built on the electron-updater package. The release archive selection is handled by
the electron-updater codebase and the filename pattern is hardcoded there. It selects the archive file that contains
`arm64` in its name (case sensitive), if present, to use for updates on macOS hosts with ARM64 architecture.

Previously, the build system produced archive files with the name format arduino-ide_<version>_macOS_ARM64.zip,
consistent with the established naming in other Arduino tooling projects. Unfortunately this naming would cause either
(depending on the order of the entries in the channel file) the x86 build to be used to update ARM64 macOS hosts
(resulting in lesser performance due to Rosetta 2 overhead) or the ARM64 build to be used to update x86 hosts (resulting
in the IDE failing to start).

So it is necessary to change the build artifact name to follow the format dictated by the electron-updater package.
Although it is not required (because electron-updater uses separate channel files for the x86 and ARM hosts), the Linux
archive filename format was also changed for the sake of consistency.
---
 electron/packager/config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/electron/packager/config.js b/electron/packager/config.js
index d460b9c82..caa1cd6b2 100644
--- a/electron/packager/config.js
+++ b/electron/packager/config.js
@@ -28,17 +28,17 @@ function artifactName() {
     }
     case 'darwin': {
       if (arch === 'arm64') {
-        return `${name}_${id}_macOS_ARM64.\$\{ext}`;
+        return `${name}_${id}_macOS_arm64.\$\{ext}`;
       }
       return `${name}_${id}_macOS_64bit.\$\{ext}`;
     }
     case 'linux': {
       switch (arch) {
         case 'arm': {
-          return `${name}_${id}_Linux_ARMv7.\$\{ext}`;
+          return `${name}_${id}_Linux_armv7.\$\{ext}`;
         }
         case 'arm64': {
-          return `${name}_${id}_Linux_ARM64.\$\{ext}`;
+          return `${name}_${id}_Linux_arm64.\$\{ext}`;
         }
         case 'x64': {
           return `${name}_${id}_Linux_64bit.\$\{ext}`;