DOCSP-30933 macos install instructions (#275)

Dave Cuthbert · web-flow · commit 85f0f5f6127d · 2023-07-24T16:08:00.000-04:00
diff --git a/source/includes/steps-install-shell-base.yaml b/source/includes/steps-install-shell-base.yaml
@@ -7,53 +7,7 @@ content: |
   Open the `MongoDB Download Center
   <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
 ---
-title: "Download the ``mongosh`` installation archive for your
-  operating system."
-ref: download-archive
-level: 4 
-content: |
-
-   Download the appropriate version of ``mongosh`` for your operating
-   system. MongoDB also provides versions of ``mongosh`` that use the
-   system's OpenSSL installation. For details, see the `MongoDB Download
-   Center <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
----
-title: "Extract the files from the downloaded archive."
-ref: extract-archive
-level: 4
-content: |
-
-   Extract the files from the downloaded archive. For example, run the
-   following command from the directory containing the downloaded
-   ``.tgz`` package:
-   
-   .. code-block:: sh
-
-      tar -zxvf mongosh-{+version+}-linux-x64.tgz
 
-   You will need to provide your exact ``.tgz`` package in the command,
-   which may vary depending on the package version you downloaded. For
-   example, the ``mongosh`` OpenSSL 3 package is:
-      
-   .. code-block:: sh
-   
-      mongosh-{+version+}-linux-x64-openssl3.tgz
-
-   The extracted ``bin`` folder contains two binaries: ``mongosh`` and
-   ``mongosh_csfle_v1.so``.
-   
-   For ``mongosh`` packages that support OpenSSL, you will see a
-   different ``.so`` file. For example, ``mongosh_crypt_v1.so``.
-
-   If your web browser automatically extracts the archive as part of the
-   download or you extract the archive without the ``tar`` command,
-   you may need to make the binary executable. Run the following
-   command from the directory where you extracted the archive:
-
-   .. code-block:: sh
-
-      chmod +x bin/mongosh
----
 title: "Add the downloaded binaries to your ``PATH`` environment
    variable."
 ref: add-shell-to-path
@@ -69,11 +23,7 @@ content: |
      .. code-block:: sh
 
        sudo cp mongosh /usr/local/bin/
-       sudo cp mongosh_csfle_v1.so /usr/local/lib/
-
-     For ``mongosh`` packages that support OpenSSL, you will see a
-     different ``.so`` file. For example, ``mongosh_crypt_v1.so``. Use
-     that file instead in the previous command.
+       sudo cp mongosh_crypt_v1.so /usr/local/lib/
 
    - Create symbolic links to the ``MongoDB Shell``. Switch to the
      directory where you extracted the files from the ``.tgz`` archive.
diff --git a/source/includes/steps-install-shell-linux-generic.yaml b/source/includes/steps-install-shell-linux-generic.yaml
@@ -5,19 +5,48 @@ source:
 ref: navigate-dlc-generic-linux
 ---
 title: "Download the Linux 64-bit ``.tgz`` package."
-ref: download-archive-rhel
+ref: download-archive-generic
 level: 4 
 content: |
 
    Download the appropriate version of ``mongosh`` for your operating
-   system. MongoDB also provides versions of ``mongosh`` that use the
-   system's OpenSSL installation. For details, see the `MongoDB Download
-   Center <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
+   system. MongoDB also provides versions of ``mongosh`` that use your
+   system's OpenSSL installation.
+   
+   See the `MongoDB Download Center
+   <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
 ---
-source:
-  file: steps-install-shell-base.yaml
-  ref: extract-archive
+title: "Extract the files from the downloaded archive."
 ref: extract-archive-generic-linux
+level: 4
+content: |
+   Go to the directory that contains the ``.tgz`` archive, then unpack
+   the archive. 
+   
+   The name of the ``.tgz`` package varies depending on the version you
+   downloaded. Replace the ``.tgz`` package name in the following
+   command with the name of the package you downloaded and run the
+   command.
+
+   .. code-block:: sh
+
+      tar -zxvf mongosh-{+version+}-linux-x64.tgz
+
+
+   The extracted archive has a ``bin`` folder that contains two files,
+   ``mongosh`` and ``mongosh_crypt_v1.so``.
+
+   If your web browser automatically extracts the archive as part of the
+   download, or if you extract the archive without using the ``tar``
+   command, you may need to make the binary executable.
+   
+   To make the binary executable, run the following command in the
+   directory where you extracted the archive:
+
+   .. code-block:: sh
+
+      chmod +x bin/mongosh
+
 ---
 source:
   file: steps-install-shell-base.yaml
diff --git a/source/includes/steps-install-shell-macos.yaml b/source/includes/steps-install-shell-macos.yaml
@@ -4,30 +4,48 @@ source:
   ref: navigate-dlc
 ref: navigate-dlc-macos
 ---
-source:
-  file: steps-install-shell-base.yaml
-  ref: download-archive
+title: "Download the ``mongosh`` installation archive for your
+  operating system."
 ref: download-archive-macos
+level: 4
+content: |
+   Download the appropriate version of ``mongosh`` for your operating
+   system. MongoDB provides versions of ``mongosh`` for Intel and ARM 
+   architectures. 
+   
+   See the `MongoDB Download Center
+   <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
+
 ---
 title: "Extract the files from the downloaded archive."
 ref: extract-zip-macos
 level: 4
 content: |
-
-   Run the following command from the directory containing the
-   ``mongosh`` ``.zip`` archive:
+   Go to the directory that contains the ``mongosh`` ``.zip`` archive,
+   then unpack the ``.zip`` file. 
+   
+   If your computer is Intel based, run:
    
    .. code-block:: sh
 
       unzip mongosh-{+version+}-darwin-x64.zip
 
-   The extracted ``bin`` folder contains two binaries: ``mongosh`` and
-   ``mongosh_csfle_v1.dylib``.
+   If your computer is ARM based (M1 or M2), run:
+   
+   .. code-block:: sh
+
+      unzip mongosh-{+version+}-darwin-arm64.zip
+
+
+   The extracted archive has a ``bin`` folder that contains two files,
+   ``mongosh`` and ``mongosh_crypt_v1.dylib``.
 
    If your web browser automatically extracts the archive as part of the
-   download or you extract the archive without the ``unzip`` command,
-   you may need to make the binary executable. Run the following
-   command from the directory where you extracted the archive:
+   download, or if you extract the archive without using the ``unzip``
+   command, you may need to make the binary executable. 
+   
+   To make the binary executable, run the following command in the
+   directory where you extracted the archive:
 
    .. code-block:: sh
 
diff --git a/source/includes/steps-install-shell-windows.yaml b/source/includes/steps-install-shell-windows.yaml
@@ -4,14 +4,29 @@ source:
   ref: navigate-dlc
 ref: navigate-dlc-windows
 ---
-source:
-  file: steps-install-shell-base.yaml
-  ref: download-archive
+title: "Download the ``mongosh`` installation archive for your
+  operating system."
 ref: download-archive-windows
+level: 4
+content: |
+   Download ``mongosh`` from the `MongoDB Download Center
+   <https://www.mongodb.com/try/download/shell?jmp=docs>`__.
+
 ---
 title: "Extract the files from the downloaded archive."
-ref: extract-archive
+ref: extract-zip-windows
 level: 4
+content: |
+   Open a ``cmd`` terminal and run the following command from the
+   directory that has the ``mongosh`` ``.zip`` archive:
+   
+   .. code-block:: sh
+
+      tar -xf mongosh-{+version+}-win32-x64.zip
+
+   The extracted archive has a ``bin`` folder that contains two files,
+   ``mongosh.exe`` and ``mongosh_crypt_v1.dll``.
+
 ---
 title: "Add the ``mongosh`` binary to your ``PATH`` environment
    variable."
