fix(product-download-page): update ubuntu/debian install instructions (…

…#633) * fix(product-download-page): update ubuntu/debian install instructions * fix(product-download-page): add changeset * fix(product-download-page): adjust styles to account for long lines * fix(product-download-page): adjust tests
hashicorp · Jul 1, 2022 · 3d0261e · 3d0261e · vercel · Jul 1, 2022
1 parent 7734cd2
commit 3d0261e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 29 deletions.
diff --git a/.changeset/cool-bananas-listen.md b/.changeset/cool-bananas-listen.md
@@ -0,0 +1,5 @@
+---
+'@hashicorp/react-product-downloads-page': patch
+---
+
+Update Ubuntu/Debian installation instructions
diff --git a/packages/product-download-page/index.test.js b/packages/product-download-page/index.test.js
@@ -46,7 +46,7 @@ describe('<ProductDownloadsPage />', () => {
       expect(
         getByText(
           downloadCards,
-          'curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -'
+          'wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg'
         )
       ).toBeInTheDocument()
 
@@ -205,26 +205,23 @@ const releases = {
           os: 'darwin',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_darwin_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'windows',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'linux',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
       ],
     },
@@ -240,26 +237,23 @@ const releases = {
           os: 'darwin',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_darwin_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'windows',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'linux',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
       ],
     },
@@ -275,26 +269,23 @@ const releases = {
           os: 'darwin',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_darwin_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_darwin_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'windows',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '0.1.0',
           os: 'linux',
           arch: 'amd64',
           filename: 'waypoint_0.1.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/0.1.0/waypoint_0.1.0_windows_amd64.zip',
         },
       ],
     },
@@ -310,17 +301,15 @@ const releases = {
           os: 'darwin',
           arch: 'amd64',
           filename: 'waypoint_1.0.0_darwin_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/1.0.0/waypoint_1.0.0_darwin_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/1.0.0/waypoint_1.0.0_darwin_amd64.zip',
         },
         {
           name: 'waypoint',
           version: '1.0.0',
           os: 'windows',
           arch: 'amd64',
           filename: 'waypoint_1.0.0_windows_amd64.zip',
-          url:
-            'https://releases.hashicorp.com/waypoint/1.0.0/waypoint_1.0.0_windows_amd64.zip',
+          url: 'https://releases.hashicorp.com/waypoint/1.0.0/waypoint_1.0.0_windows_amd64.zip',
         },
       ],
     },

diff --git a/packages/product-download-page/package-managers.ts b/packages/product-download-page/package-managers.ts
@@ -15,9 +15,9 @@ export function generateDefaultPackageManagers(
     {
       label: 'Ubuntu/Debian',
       commands: [
-        `curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -`,
-        `sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"`,
-        `sudo apt-get update && sudo apt-get install ${productSlug}`,
+        `wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg`,
+        `echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list`,
+        `sudo apt update && sudo apt install ${productSlug}`,
       ],
       os: 'linux',
     },
@@ -66,9 +66,9 @@ export function generateEnterprisePackageManagers(
     {
       label: 'Ubuntu/Debian',
       commands: [
-        `curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -`,
-        `sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"`,
-        `sudo apt-get update && sudo apt-get install ${productSlug}-enterprise`,
+        `wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg`,
+        `echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list`,
+        `sudo apt update && sudo apt install ${productSlug}-enterprise`,
       ],
       os: 'linux',
     },

diff --git a/packages/product-download-page/partials/download-cards/style.module.css b/packages/product-download-page/partials/download-cards/style.module.css
@@ -107,6 +107,8 @@
   border-radius: 3px;
   text-align: left;
   margin: 32px 0;
+  overflow-x: auto;
+  max-width: calc(100vw - 96px);
 
   & pre {
     margin: 0;
@@ -122,6 +124,11 @@
       margin-right: 8px;
     }
 
+    &::after {
+      content: ' ';
+      margin-left: 8px;
+    }
+
     @media (--medium-up) {
       white-space: pre;
     }