Merge pull request #89 from gstavrinos/mix-up-fix

Fixed ROS1 distributions mix-up

README.md

@@ -75,3 +75,4 @@ TODO
 - [For versions >= `v2.4.0`] Added support for ROS2 Jazzy. **NOTE**: The `ros2ez` command has now been disabled, since currently two ROS2 LTS versions are supported. ROS2 Humble can now been used with the `ros2ezh` command, following the typical `rosez*`/`ros2ez*` scheme. **WARNING**: This versions breaks humble installations. In order to migrate, your best bet is to rename `ros2ez-volume*` volumes to their equivalent `ros2ezh-volume*`. Accidentally, a new bug for ROS1 was introduced in this release. It is fixed in `v2.5.0`.
 - [For versions >= `v2.5.0`] Added rust support for all ROS distributions. Also, fixed bug #79 that was introduced in `v2.3.0`.
 - [For versions >= `v2.5.1`] Now deleting all problematic locks instead of just the oldest and fixed #85 (exec locks daemon bug).
+- [For versions >= `v2.5.2`] Fixed a bug that was introduced in `v2.4.0` where `rosez` and `rosezm` could get mixed up when used simultaneously (issue #88).

internal/rosez_exec.bash

@@ -141,7 +141,7 @@ touch $xauthf
 intermediate_error_handler $?
 /bin/bash -c "xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $xauthf nmerge -"
 intermediate_error_handler $?
-container_id=$(docker ps -q --filter "name=$ros_image")
+container_id=$(docker ps | grep -w "$ros_image" | awk '{print $1}')
 found_lock="$(find $lockation -maxdepth 1 -name "$exec_lock_prefix*$exec_lock_suffix" -print | sort | head -1)"
 fl="$(basename "$found_lock")"
 while [[ -n "$fl" && "$fl" < "$earliest_possible_exec_lock_file" ]]; do
@@ -157,7 +157,7 @@ if [[ -z "$container_id" ]]; then
   intermediate_error_handler $?
   echo -e "${colour_blue}$ros_image daemon not found.${colour_end}\nExecuting:\n---\n$x\n---"
   eval "$x"
-  container_id=$(docker ps -q --filter "name=$ros_image")
+  container_id=$(docker ps | grep -w "$ros_image" | awk '{print $1}')
   intermediate_error_handler $?
 fi
 if [[ -z "$container_id" ]]; then