From c37221cfe109a508651d4ad2b70a3974086c9a04 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 13:19:46 -0400
Subject: [PATCH] Update macOS-Development-Setup.rst (#3758) (#3768)

- add Xcode App Store link
    - BASH -> ZSH (default)
    - make homebrew paths generic

Co-authored-by: Philipp Dittmann <dittmann@cs.uni-bremen.de>
(cherry picked from commit 15260f5e7af08b97c9716286f625571df5d8c31f)

Co-authored-by: PhDittmann <dittmann@tzi.de>
---
 .../Alternatives/macOS-Development-Setup.rst       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/Installation/Alternatives/macOS-Development-Setup.rst b/source/Installation/Alternatives/macOS-Development-Setup.rst
index e8121b2aaf..6dd60e54f7 100644
--- a/source/Installation/Alternatives/macOS-Development-Setup.rst
+++ b/source/Installation/Alternatives/macOS-Development-Setup.rst
@@ -29,7 +29,7 @@ You need the following things installed to build ROS 2:
 #.
    **Xcode**
 
-   * If you don't already have it installed, install Xcode.
+   * If you don't already have it installed, install [Xcode](https://apps.apple.com/app/xcode/id497799835).
    * Note: Versions of Xcode later than 11.3.1 can no longer be installed on macOS Mojave, so you will need to install an older version manually, see: https://stackoverflow.com/a/61046761
    * Also, if you don't already have it installed, install the Command Line Tools:
 
@@ -71,12 +71,12 @@ You need the following things installed to build ROS 2:
    .. code-block:: bash
 
       # Add the openssl dir for DDS-Security
-      # if you are using ZSH, then replace '.bashrc' with '.zshrc'
-      echo "export OPENSSL_ROOT_DIR=$(brew --prefix openssl)" >> ~/.bashrc
+      # if you are using BASH, then replace '.zshrc' with '.bashrc'
+      echo "export OPENSSL_ROOT_DIR=$(brew --prefix openssl)" >> ~/.zshrc
 
       # Add the Qt directory to the PATH and CMAKE_PREFIX_PATH
-      export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/usr/local/opt/qt@5
-      export PATH=$PATH:/usr/local/opt/qt@5/bin
+      export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$(brew --prefix qt@5)
+      export PATH=$PATH:$(brew --prefix qt@5)/bin
 
 #.
    Use ``python3 -m pip`` (just ``pip`` may install Python3 or Python2) to install more stuff:
@@ -92,7 +92,7 @@ You need the following things installed to build ROS 2:
         nose pep8 psutil pydocstyle pydot pygraphviz pyparsing==2.4.7 \
         pytest-mock rosdep rosdistro setuptools==59.6.0 vcstool
 
-   Please ensure that the ``$PATH`` environment variable contains the install location of the binaries (default: ``$HOME/Library/Python/<version>/bin``)
+   Please ensure that the ``$PATH`` environment variable contains the install location of the binaries (``$(brew --prefix)/bin``)
 
 #.
    *Optional*: if you want to build the ROS 1<->2 bridge, then you must also install ROS 1:
@@ -156,7 +156,7 @@ Source the ROS 2 setup file:
 
 .. code-block:: bash
 
-   . ~/ros2_{DISTRO}/install/setup.bash
+   . ~/ros2_{DISTRO}/install/setup.zsh
 
 This will automatically set up the environment for any DDS vendors that support was built for.