From dfea55f07bfe57119487abe435c39e81d8ea5034 Mon Sep 17 00:00:00 2001
From: Matthijs van der Burgh <MatthijsBurgh@outlook.com>
Date: Fri, 26 Apr 2024 13:48:50 +0200
Subject: [PATCH 1/3] (README) Fix instruction of ros-remove-source

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a6781dd6e..60193b018 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ otherwise it will delete the repository as well.
 
 ```yaml
 - type: ros-remove-source
-  remove:
+  source:
     type: git
     url: <Repository URL>
     eol: <End of life date>
@@ -260,7 +260,7 @@ Again, this can be distro-specific.
       eol: <End of life date>
       path: <Directory of the cloned repository> (Optional field)
   noetic:
-    remove: null
+    source: null
 ```
 
 #### Catkin package install

From 0034bdf5dbd08a5866b62db9924f254e8e3e8ef7 Mon Sep 17 00:00:00 2001
From: Matthijs van der Burgh <MatthijsBurgh@outlook.com>
Date: Fri, 3 May 2024 15:28:43 +0200
Subject: [PATCH 2/3] (ros-remove-source) fix order of execution for ros2

---
 installer/tue-install-impl.bash | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/installer/tue-install-impl.bash b/installer/tue-install-impl.bash
index ae813ab64..148a5d8e6 100755
--- a/installer/tue-install-impl.bash
+++ b/installer/tue-install-impl.bash
@@ -1615,13 +1615,17 @@ function tue-install-ros-remove-source
     if [[ -e "${ros_pkg_dir}" ]]
     then
         tue-install-debug "Source package found in the workspace, removing it, so the system installed version is used"
+        # Clean the package from the workspace in colcon
+        if [[ "${TUE_ENV_ROS_VERSION}" != "1" ]]
+        then
+            tue-install-pipe /usr/bin/python3 -m colcon clean packages --log-base "${TUE_WS_DIR}"/log --base-paths "${TUE_WS_DIR}"/src --build-base "${TUE_WS_DIR}"/build --install-base "${TUE_WS_DIR}"/install --packages-select "${ros_pkg_name}" -y
+        fi
+
         tue-install-pipe rm "${ros_pkg_dir}"
 
-        # Clean the package from the workspace
-        if [[ "${TUE_ROS_VERSION}" != "1" ]]
+        # Clean the package from the workspace in catkin
+        if [[ "${TUE_ROS_VERSION}" == "1" ]]
         then
-            tue-install-pipe /usr/bin/python3 -m colcon clean packages --log-base "${TUE_WS_DIR}"/log --base-paths "${TUE_WS_DIR}"/src --build-base "${TUE_WS_DIR}"/build --install-base "${TUE_WS_DIR}"/install --packages-select "${ros_pkg_name}" -y
-        else
             tue-install-pipe catkin clean --workspace "${TUE_WS_DIR}" --orphans
         fi
     else

From cc8d0a61f91991ae734f49700d4ac3524b26598e Mon Sep 17 00:00:00 2001
From: Matthijs van der Burgh <MatthijsBurgh@outlook.com>
Date: Fri, 3 May 2024 15:29:11 +0200
Subject: [PATCH 3/3] Bump VERSION to 1.25.5

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 26a9e99b3..b45fe3106 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.25.4
+1.25.5