From 2195ea9a57f3ca4a0a2b8517ee1f64ae70e2146b Mon Sep 17 00:00:00 2001
From: Rakesh Vivekanandan <rakeshvivek97@gmail.com>
Date: Fri, 19 Jul 2024 11:16:24 -0700
Subject: [PATCH] linting fix and minor change to installation script

---
 extras/ros-jazzy-gz-harmonic-install.sh      | 6 ++----
 gazebo/dave_gz_sensor_plugins/CMakeLists.txt | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extras/ros-jazzy-gz-harmonic-install.sh b/extras/ros-jazzy-gz-harmonic-install.sh
index 8054f348..65b286b2 100644
--- a/extras/ros-jazzy-gz-harmonic-install.sh
+++ b/extras/ros-jazzy-gz-harmonic-install.sh
@@ -72,7 +72,7 @@ sudo apt update && apt install -y \
     python3-vcstool \
     $GAZEBO \
     ros-$DIST-desktop-full \
-    ros-$DIST-gz-plugin-vendor \
+    ros-$DIST-ros-gz \
     ros-$DIST-gz-ros2-control \
     ros-$DIST-effort-controllers \
     ros-$DIST-geographic-info \
@@ -87,7 +87,6 @@ sudo apt update && apt install -y \
     ros-$DIST-pcl-ros \
     ros-$DIST-robot-localization \
     ros-$DIST-robot-state-publisher \
-    ros-$DIST-ros-base \
     ros-$DIST-ros2-controllers \
     ros-$DIST-rqt \
     ros-$DIST-rqt-common-plugins \
@@ -99,8 +98,7 @@ sudo apt update && apt install -y \
     ros-$DIST-tf2-tools \
     ros-$DIST-urdfdom-py \
     ros-$DIST-xacro \
-    ros-dev-tools \
-    ros-$DIST-ros-gz
+    ros-dev-tools
 
 echo
 echo -e "\033[32m============================================================\033[0m"
diff --git a/gazebo/dave_gz_sensor_plugins/CMakeLists.txt b/gazebo/dave_gz_sensor_plugins/CMakeLists.txt
index 837afe30..b5a522e5 100644
--- a/gazebo/dave_gz_sensor_plugins/CMakeLists.txt
+++ b/gazebo/dave_gz_sensor_plugins/CMakeLists.txt
@@ -59,7 +59,8 @@ install(DIRECTORY include/
 )
 
 # Environment hooks
-ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in")
+ament_environment_hooks(
+  "${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in")
 
 # Testing setup
 if(BUILD_TESTING)