From 4ca70dd49b9011e880531b825985e03d4cb4d719 Mon Sep 17 00:00:00 2001
From: RonaldsonBellande <ronaldsonbellande@gmail.com>
Date: Thu, 23 May 2024 19:30:40 -0400
Subject: [PATCH] latest pushes

---
 README.md                                       |  2 +-
 .../CMakeLists.txt                              |  3 ++-
 ros_web_api_bellande_step/CMakeLists.txt        | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index f7c307f..ec6c1c5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The primary functionality of this API is to provide access to Bellande Algorithm
 
 ## 🐳 API
 - [![Bellande Step](https://img.shields.io/badge/Bellande%20API-Bellande/Step-0099cc?style=for-the-badge)](https://github.com/Robotics-Sensors/bellande_robots_step)
-- [![Bellande Step](https://img.shields.io/badge/Bellande%20API-Bellande/Search%20Path-0099cc?style=for-the-badge)](https://github.com/Robotics-Sensors/bellande_search_path)
+- [![Bellande Search Path](https://img.shields.io/badge/Bellande%20API-Bellande/Search%20Path-0099cc?style=for-the-badge)](https://github.com/Robotics-Sensors/bellande_search_path)
 
 
 ## 💻 Usage
diff --git a/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt b/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt
index a9601ab..6bf5ded 100644
--- a/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt
+++ b/ros_web_api_bellande_2d_computer_vision/CMakeLists.txt
@@ -44,8 +44,9 @@ if($ENV{ROS_VERSION} EQUAL "1")
     install(PROGRAMS src/bellande_2d_computer_vision_api_2d.py DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
     install(DIRECTORY config/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config)
     install(DIRECTORY launch/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
-elseif($ENV{ROS_VERSION} EQUAL "2")
+else()
     install(PROGRAMS src/bellande_2d_computer_vision_api_2d.py DESTINATION lib/${PROJECT_NAME})
     install(DIRECTORY config/ DESTINATION share/${PROJECT_NAME}/config)
     install(DIRECTORY launch/ DESTINATION share/${PROJECT_NAME}/launch)
+    ament_package()
 endif()
diff --git a/ros_web_api_bellande_step/CMakeLists.txt b/ros_web_api_bellande_step/CMakeLists.txt
index ae4d43f..e7e737c 100644
--- a/ros_web_api_bellande_step/CMakeLists.txt
+++ b/ros_web_api_bellande_step/CMakeLists.txt
@@ -39,6 +39,15 @@ if($ENV{ROS_VERSION} EQUAL 1)
   )
 endif()
 
+# Install Python scripts for both ROS 1
+if($ENV{ROS_VERSION} EQUAL 1)
+  catkin_install_python(
+    PROGRAMS
+    src/bellande_step_api_2d.py
+    DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+  )
+endif()
+
 # Install Python scripts, configuration files, and launch files
 if($ENV{ROS_VERSION} EQUAL "1")
     install(PROGRAMS src/bellande_step_api_2d.py DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
@@ -48,11 +57,5 @@ elseif($ENV{ROS_VERSION} EQUAL "2")
     install(PROGRAMS src/bellande_step_api_2d.py DESTINATION lib/${PROJECT_NAME})
     install(DIRECTORY config/ DESTINATION share/${PROJECT_NAME}/config)
     install(DIRECTORY launch/ DESTINATION share/${PROJECT_NAME}/launch)
+    ament_package()
 endif()
-
-# Install Python scripts for both ROS 1 and ROS 2
-catkin_install_python(
-  PROGRAMS
-  src/bellande_step_api_2d.py
-  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-)