Add CRT to winget installation steps

filips123 · Oct 25, 2021 · 4a0b468 · 4a0b468
1 parent 08ce97f
commit 4a0b468
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/extension/src/setup/instructions.html b/extension/src/setup/instructions.html
@@ -34,8 +34,9 @@
             <span><em>Or...</em> To install the package using Windows Package Manager:</span>
             <ol>
               <li>Make sure <a href="https://github.com/microsoft/winget-cli#installing-the-client" target="_blank">Windows Package Manager</a> is installed.</li>
-              <li>Install the package using winget: <kbd>winget install firefoxpwa --version <span class="connector-project-version"></span></kbd></li>
-              <li>After the package is installed, you should be automatically proceeded to the next step. If nothing changes after around 30 seconds, restart the browser.</li>
+              <li>Install Visual C++ Redistributable using winget: <kbd>winget install -e Microsoft.VC++2015-2019Redist-<span id="connector-crt-arch"></span></kbd>.</li>
+              <li>Install FirefoxPWA using winget: <kbd>winget install firefoxpwa --version <span class="connector-project-version"></span></kbd></li>
+              <li>After the packages are installed, you should be automatically proceeded to the next step. If nothing changes after around 30 seconds, restart the browser.</li>
             </ol>
           </div>
           <div>

diff --git a/extension/src/setup/instructions.js b/extension/src/setup/instructions.js
@@ -6,12 +6,11 @@ async function prepareInstallInstructions () {
   const version = browser.runtime.getManifest().version
   const { os, arch } = await browser.runtime.getPlatformInfo()
 
-  // Set CRT download URL based on system arch and extension version
-  let crtArch
-  if (arch === 'x86-64') crtArch = 'x64'
-  else if (arch === 'x86-32') crtArch = 'x86'
-  else if (arch === 'arm') crtArch = 'arm64'
-  document.getElementById('connector-download-url-crt').setAttribute('href', `https://aka.ms/vs/16/release/vc_redist.${crtArch}.exe`)
+  // Set CRT download URL based on system arch
+  document.getElementById('connector-download-url-crt').setAttribute('href', `https://aka.ms/vs/16/release/vc_redist.${arch === 'x86-32' ? 'x86' : 'x64'}.exe`)
+
+  // Set CRT winget package based on system arch
+  document.getElementById('connector-crt-arch').innerText = arch === 'x86-32' ? 'x86' : 'x64'
 
   // Set MSI download URL based on system arch and extension version
   // Currently just relying on x86 emulation for Windows ARM