Skip to content

Commit 9dc38b2

Browse files
committed
replaced <ros2_distro> with $ROS_DISTRO
1 parent ae24fed commit 9dc38b2

13 files changed

+29
-29
lines changed

development_guides/build_docs/build_troubleshooting_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Common Nav2 Dependencies Build Failures
99
* Make sure that .bashrc file has no ROS environment variables in it. Open new terminals and try to build the packages again.
1010

1111
* Make sure to run rosdep for the correct ROS 2 distribution.
12-
``rosdep install -y -r -q --from-paths src --ignore-src --rosdistro <ros2-distro>``
12+
``rosdep install -y -r -q --from-paths src --ignore-src --rosdistro $ROS_DISTRO``
1313

1414
* Make sure that the ``setup.bash`` is sourced in the ROS 2 installation or ROS 2 main build workspace, if applicable. Check if you can run talker and listener nodes.
1515

getting_started/index.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ Thus, for Jazzy and newer, the installation packages and instructions are slight
2828

2929
.. code-block:: bash
3030
31-
sudo apt install ros-<ros2-distro>-navigation2
32-
sudo apt install ros-<ros2-distro>-nav2-bringup
31+
sudo apt install ros-$ROS_DISTRO-navigation2
32+
sudo apt install ros-$ROS_DISTRO-nav2-bringup
3333
3434
3. Install the demo robot (Turtlebot) for gazebo:
3535

3636
For **Jazzy and newer**, install the Turtlebot 3 & 4 packages for Gazebo Modern. It should be automatically installed with ``nav2_bringup``:
3737

3838
.. code-block:: bash
3939
40-
sudo apt install ros-<ros2-distro>-nav2-minimal-tb*
40+
sudo apt install ros-$ROS_DISTRO-nav2-minimal-tb*
4141
4242
4343
For **Iron and older**, install Turtlebot 3 packages for gazebo classic:
4444

4545
.. code-block:: bash
4646
47-
sudo apt install ros-<ros2-distro>-turtlebot3-gazebo
47+
sudo apt install ros-$ROS_DISTRO-turtlebot3-gazebo
4848
4949
Running the Example
5050
*******************
@@ -54,9 +54,9 @@ Running the Example
5454

5555
.. code-block:: bash
5656
57-
source /opt/ros/<ros2-distro>/setup.bash
57+
source /opt/ros/$ROS_DISTRO/setup.bash
5858
export TURTLEBOT3_MODEL=waffle # Iron and older only with Gazebo Classic
59-
export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:/opt/ros/<ros2-distro>/share/turtlebot3_gazebo/models # Iron and older only with Gazebo Classic
59+
export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:/opt/ros/$ROS_DISTRO/share/turtlebot3_gazebo/models # Iron and older only with Gazebo Classic
6060
6161
3. In the same terminal, run:
6262

setup_guides/odom/setup_odom_gz.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Setup and Prerequisites
8181

8282
.. code-block:: shell
8383
84-
sudo apt install ros-<ros2-distro>-ros-gz
84+
sudo apt install ros-$ROS_DISTRO-ros-gz
8585
8686
Adding Gazebo Plugins to a URDF/SDF
8787
===================================

setup_guides/odom/setup_odom_gz_classic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ We also need to install the ``gazebo_ros_pkgs`` package to simulate odometry and
8181

8282
.. code-block:: shell
8383
84-
sudo apt install ros-<ros2-distro>-gazebo-ros-pkgs
84+
sudo apt install ros-$ROS_DISTRO-gazebo-ros-pkgs
8585
8686
You can test if you have successfully set up your ROS 2 and Gazebo environments by following the instructions `given here <http://gazebosim.org/tutorials?tut=ros2_installing&cat=connect_ros#TestingGazeboandROS2integration>`_.
8787

setup_guides/odom/setup_robot_localization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ First, install the ``robot_localization`` package using your machines package ma
2929

3030
.. code-block:: shell
3131
32-
sudo apt install ros-<ros2-distro>-robot-localization
32+
sudo apt install ros-$ROS_DISTRO-robot-localization
3333
3434
Next, we specify the parameters of the ``ekf_node`` using a YAML file. Create a directory named ``config`` at the root of your project and create a file named ``ekf.yaml``. Copy the following lines of code into your ``ekf.yaml`` file.
3535

setup_guides/sdf/setup_sdf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ We can also use our SDF with the robot_state_publisher using the following packa
1717

1818
.. code-block:: shell
1919
20-
sudo apt install ros-<ros2-distro>-sdformat-urdf
20+
sudo apt install ros-$ROS_DISTRO-sdformat-urdf
2121
2222
This package contains a C++ library and urdf_parser_plugin for converting SDFormat XML into URDF C++ structures. Installing it allows one to use SDFormat XML instead of URDF XML as a robot description.
2323

setup_guides/sensors/mapping_localization.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ To be able to launch ``slam_toolbox``, make sure that you have installed the ``s
167167

168168
.. code-block:: shell
169169
170-
sudo apt install ros-<ros2-distro>-slam-toolbox
170+
sudo apt install ros-$ROS_DISTRO-slam-toolbox
171171
172172
We will launch the ``async_slam_toolbox_node`` of ``slam_toolbox`` using the package's built-in launch files. Open a new terminal and then execute the following lines:
173173

@@ -199,8 +199,8 @@ First, Make sure you have installed the Nav2 packages by executing the following
199199

200200
.. code-block:: shell
201201
202-
sudo apt install ros-<ros2-distro>-navigation2
203-
sudo apt install ros-<ros2-distro>-nav2-bringup
202+
sudo apt install ros-$ROS_DISTRO-navigation2
203+
sudo apt install ros-$ROS_DISTRO-nav2-bringup
204204
205205
We will now launch Nav2 using the ``nav2_bringup``'s built-in launch file, ``navigation_launch.py`` . Open a new terminal and execute the following:
206206

setup_guides/urdf/setup_urdf.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Let's begin by installing some additional ROS 2 packages that we will be using d
3333

3434
.. code-block:: shell
3535
36-
sudo apt install ros-<ros2-distro>-joint-state-publisher-gui
37-
sudo apt install ros-<ros2-distro>-xacro
36+
sudo apt install ros-$ROS_DISTRO-joint-state-publisher-gui
37+
sudo apt install ros-$ROS_DISTRO-xacro
3838
3939
Next, create a directory for your project, initialize a ROS 2 workspace and give your robot a name. For ours, we'll be calling it ``sam_bot``.
4040

tutorials/docs/camera_calibration.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ Requirements
1818

1919
1- Install Camera Calibration Parser, Camera Info Manager and Launch Testing Ament Cmake using operating system’s package manager:
2020

21-
``sudo apt install ros-<ros2-distro>-camera-calibration-parsers``
21+
``sudo apt install ros-$ROS_DISTRO-camera-calibration-parsers``
2222

23-
``sudo apt install ros-<ros2-distro>-camera-info-manager``
23+
``sudo apt install ros-$ROS_DISTRO-camera-info-manager``
2424

25-
``sudo apt install ros-<ros2-distro>-launch-testing-ament-cmake``
25+
``sudo apt install ros-$ROS_DISTRO-launch-testing-ament-cmake``
2626

2727

2828
2- Image Pipeline need to be built from source in your workspace with:
2929

30-
``git clone -b <ros2-distro> [email protected]:ros-perception/image_pipeline.git``
30+
``git clone -b $ROS_DISTRO [email protected]:ros-perception/image_pipeline.git``
3131

3232

3333
**Also, make sure you have the following:**

tutorials/docs/navigation2_on_real_turtlebot3.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The turtlebot3 software can be installed via the following or on the `turtlebot3
3434

3535
.. code-block:: bash
3636
37-
sudo apt install ros-<ros2-distro>-turtlebot3 ros-<ros2-distro>-turtlebot3-msgs ros-<ros2-distro>-turtlebot3-bringup
37+
sudo apt install ros-$ROS_DISTRO-turtlebot3 ros-$ROS_DISTRO-turtlebot3-msgs ros-$ROS_DISTRO-turtlebot3-bringup
3838
3939
Tutorial Steps
4040
==============
@@ -44,7 +44,7 @@ Tutorial Steps
4444

4545
Run the following commands first whenever you open a new terminal during this tutorial.
4646

47-
- ``source /opt/ros/<ros2-distro>/setup.bash``
47+
- ``source /opt/ros/$ROS_DISTRO/setup.bash``
4848
- ``export TURTLEBOT3_MODEL=waffle``
4949

5050
1- Launch Turtlebot 3

0 commit comments

Comments
 (0)