rosmon_core: env-hooks: follow symbolic links during file name sugges…

…tion This fixes bash completion for colcon linked install spaces.
xqms · Oct 14, 2020 · b744e79 · b744e79
1 parent 5b90e17
commit b744e79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rosmon_core/CMakeLists.txt b/rosmon_core/CMakeLists.txt
@@ -159,7 +159,7 @@ if(CATKIN_ENABLE_TESTING)
 	endif()
 endif()
 
-# Version 1.5 (increment this comment to trigger a CMake update)
+# Version 1.6 (increment this comment to trigger a CMake update)
 catkin_add_env_hooks(50-rosmon
 	SHELLS bash zsh
 	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks

diff --git a/rosmon_core/env-hooks/50-rosmon.bash b/rosmon_core/env-hooks/50-rosmon.bash
@@ -68,7 +68,7 @@ function _mon() {
 			# If we have no launch file yet, offer launch files
 			elif [[ ( ! -f $package_name ) && -z $launch_name ]]; then
 				local package_dir="$(rospack find ${COMP_WORDS[2]})"
-				local launchfiles=$(find "$package_dir" -name '*.launch' -type f -printf "%f\n")
+				local launchfiles=$(find -L "$package_dir" -name '*.launch' -type f -printf "%f\n")
 				COMPREPLY=( $(compgen -W "${launchfiles} ${FLAGS[*]} ${OPTS[*]}" -- $cur) )
 
 			# Only arguments now

diff --git a/rosmon_core/env-hooks/50-rosmon.zsh b/rosmon_core/env-hooks/50-rosmon.zsh
@@ -43,7 +43,7 @@ function _launch_file() {
 		_launch_arg
 	else
 		package=${line[2]}
-		files=("${(@f)$(find $(rospack find ${package}) -name '*.launch' -type f -printf "%f\n")}")
+		files=("${(@f)$(find -L $(rospack find ${package}) -name '*.launch' -type f -printf "%f\n")}")
 		if [[ $#files -gt 0 ]]; then
 			_values 'launch files' $files
 		fi