Windows: Stop referring to 32-bit/64-bit, refer to x64/ARM64 instead

As of v2.47.1, Git for Windows provides an ARM64 version, and as of
v2.49.0 it stopped providing an i686 version.

The preceding commit updated the information in `hugo.yml` to reflect
this, and now it is time to use that information to present the download
links accordingly.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

assets/js/application.js

@@ -593,26 +593,39 @@ var Downloads = {
     return `<strong>${ago}</strong>, `;
   },
 
-  adjustFor32BitWindows: function() {
-    // adjust the auto-link for Windows 32-bit setups
-    const is32BitWindows = window.session.browser.os === 'Windows'
-      && !navigator.userAgent.match(/WOW64|Win64|x64|x86_64/)
-    if (!is32BitWindows) return;
-
-    const link = $('#auto-download-link');
-    const version = $('#auto-download-version');
-    const bitness = $('#auto-download-bitness');
-    const date = $('#auto-download-date');
-    if (link.length && version.length && bitness.length && date.length) {
-      bitness.html('32-bit');
-      link.attr('href', '{{ .Site.Params.windows_installer.installer32.url }}');
-      version.html('{{ .Site.Params.windows_installer.installer32.version }}');
-      date.html('{{ .Site.Params.windows_installer.installer32.release_date }}');
-    }
+  adjustForWindowsARM64: function() {
+    /*
+     * Windows/ARM64 cannot be reliably detected via the User-Agent string;
+     * Instead, we use the UAData, but that is not available in all browsers.
+     * For more details, see
+     * https://github.com/git-for-windows/git-for-windows.github.io/pull/61
+     */
+    if (!navigator.userAgentData) return;
+
+    navigator.userAgentData.getHighEntropyValues(['architecture', 'platform', 'bitness'])
+		  .then(function(browser) {
+				if (
+          browser.platform !== 'Windows'
+          || browser.bitness !== '64'
+          || browser.architecture !== 'arm'
+        ) return;
+
+        // adjust the auto-link for Windows/ARM64 setups
+        const link = $('#auto-download-link');
+        const version = $('#auto-download-version');
+        const architecture = $('#auto-download-architecture');
+        const date = $('#auto-download-date');
+        if (link.length && version.length && architecture.length && date.length) {
+          architecture.html('ARM64');
+          link.attr('href', '{{ .Site.Params.windows_installer.installer_arm64.url }}');
+          version.html('{{ .Site.Params.windows_installer.installer_arm64.version }}');
+          date.html('{{ .Site.Params.windows_installer.installer_arm64.release_date }}');
+        }
+      })
   },
 
   postProcessDownloadPage: function() {
-    Downloads.adjustFor32BitWindows();
+    Downloads.adjustForWindowsARM64();
     $('#relative-release-date').html(Downloads.postProcessReleaseDate);
   },
 }

content/downloads/win.html

@@ -8,26 +8,26 @@
 <div id="main">
   <h1>Download for Windows</h1>
   <p>
-  <strong><a id="auto-download-link" href="{{< site-param windows_installer.installer64.url >}}">Click here to download </a></strong>
-    the latest (<strong id="auto-download-version">{{< site-param windows_installer.installer64.version >}}</strong>)
-    <strong id="auto-download-bitness">64-bit</strong> version of <strong>Git for Windows</strong>.
+  <strong><a id="auto-download-link" href="{{< site-param windows_installer.installer_x64.url >}}">Click here to download </a></strong>
+    the latest (<strong id="auto-download-version">{{< site-param windows_installer.installer_x64.version >}}</strong>)
+    <strong id="auto-download-architecture">x64</strong> version of <strong>Git for Windows</strong>.
     This is the most recent <a href="https://git-for-windows.github.io/">maintained build</a>.
-    It was released <span id="relative-release-date"></span>on <span id="auto-download-date">{{< site-param windows_installer.installer64.release_date >}}</span>.
+    It was released <span id="relative-release-date"></span>on <span id="auto-download-date">{{< site-param windows_installer.installer_x64.release_date >}}</span>.
   </p>
   <h3>Other Git for Windows downloads</h3>
   <h4>Standalone Installer</h4>
   <p>
-  <strong><a href="{{< site-param windows_installer.installer32.url >}}">32-bit Git for Windows Setup</a>.</strong>
+    <strong><a href="{{< site-param windows_installer.installer_x64.url >}}">Git for Windows/x64 Setup</a>.</strong>
   </p>
   <p>
-    <strong><a href="{{< site-param windows_installer.installer64.url >}}">64-bit Git for Windows Setup</a>.</strong>
+    <strong><a href="{{< site-param windows_installer.installer_arm64.url >}}">Git for Windows/ARM64 Setup</a>.</strong>
   </p>
   <h4>Portable ("thumbdrive edition")</h4>
   <p>
-    <strong><a href="{{< site-param windows_installer.portable32.url >}}">32-bit Git for Windows Portable</a>.</strong>
+    <strong><a href="{{< site-param windows_installer.portable_x64.url >}}">Git for Windows/x64 Portable</a>.</strong>
   </p>
   <p>
-    <strong><a href="{{< site-param windows_installer.portable64.url >}}">64-bit Git for Windows Portable</a>.</strong>
+    <strong><a href="{{< site-param windows_installer.portable_arm64.url >}}">Git for Windows/ARM64 Portable</a>.</strong>
   </p>
   <h4>Using winget tool</h4>
   <p>

layouts/partials/monitor.html

@@ -10,7 +10,7 @@ <h4> Latest source Release </h4>
   <span class="release-date">
     ({{ .Site.Params.latest_release_date }})
   </span>
-  <span data-mac="{{ .Site.Params.macos_installer.version }}" data-win="{{ .Site.Params.windows_installer.installer64.version }}" id="installer-version"></span>
+  <span data-mac="{{ .Site.Params.macos_installer.version }}" data-win="{{ .Site.Params.windows_installer.installer_x64.version }}" id="installer-version"></span>
 
   <a href="https://www.kernel.org/pub/software/scm/git/" class="button" id="download-link">Download Source Code</a>
 </div>