fix bash completion for Fortress (#333)

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
gazebosim · Jul 20, 2022 · c0c54bb · c0c54bb
1 parent c3ac30a
commit c0c54bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -44,8 +44,7 @@ foreach(test ${test_list})
   # multi-configuration generators, like Visual Studio.
   target_compile_definitions(${test} PRIVATE
     "DETAIL_IGN_TRANSPORT_TEST_DIR=\"$<TARGET_FILE_DIR:${test}>\""
-    "IGN_TEST_LIBRARY_PATH=\"$<TARGET_FILE_DIR:${PROJECT_LIBRARY_TARGET_NAME}>\""
-    "PROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"")
+    "IGN_TEST_LIBRARY_PATH=\"$<TARGET_FILE_DIR:${PROJECT_LIBRARY_TARGET_NAME}>\"")
 endforeach()
 
 if(MSVC)

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
@@ -47,7 +47,8 @@ foreach(test ${test_list})
   # multi-configuration generators, like Visual Studio.
   target_compile_definitions(${test} PRIVATE
     "DETAIL_IGN_TRANSPORT_TEST_DIR=\"$<TARGET_FILE_DIR:${test}>\""
-    "IGN_TEST_LIBRARY_PATH=\"$<TARGET_FILE_DIR:${PROJECT_LIBRARY_TARGET_NAME}>\"")
+    "IGN_TEST_LIBRARY_PATH=\"$<TARGET_FILE_DIR:${PROJECT_LIBRARY_TARGET_NAME}>\""
+    "PROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"")
 
 endforeach()
 

diff --git a/src/cmd/ign_TEST.cc b/src/cmd/ign_TEST.cc
@@ -466,7 +466,7 @@ TEST(ignTest, TopicEchoNum)
 TEST(ignTest, ServiceHelpVsCompletionFlags)
 {
   // Flags in help message
-  std::string helpOutput = custom_exec_str("ign service --help" + g_ignVersion);
+  std::string helpOutput = custom_exec_str("ign service --help");
 
   // Call the output function in the bash completion script
   std::filesystem::path scriptPath = PROJECT_SOURCE_DIR;
@@ -499,7 +499,7 @@ TEST(ignTest, ServiceHelpVsCompletionFlags)
 TEST(ignTest, TopicHelpVsCompletionFlags)
 {
   // Flags in help message
-  std::string helpOutput = custom_exec_str("ign topic --help" + g_ignVersion);
+  std::string helpOutput = custom_exec_str("ign topic --help");
 
   // Call the output function in the bash completion script
   std::filesystem::path scriptPath = PROJECT_SOURCE_DIR;

diff --git a/src/cmd/transport.bash_completion.sh b/src/cmd/transport.bash_completion.sh
@@ -20,8 +20,6 @@
 # This is a per-library function definition, used in conjunction with the
 # top-level entry point in ign-tools.
 
-# TODO: In Fortress+, remove --force-version and --versions. Add --help-all.
-# Update ../ign_TEST.cc accordingly.
 GZ_SERVICE_COMPLETION_LIST="
   -h --help
   -v --version
@@ -32,12 +30,9 @@ GZ_SERVICE_COMPLETION_LIST="
   -l --list
   -i --info
   -r --req
-  --force-version
-  --versions
+  --help-all
 "
 
-# TODO: In Fortress+, remove --force-version and --versions. Add
-# `-v --version` and --json-output. Update ../ign_TEST.cc accordingly.
 GZ_TOPIC_COMPLETION_LIST="
   -h --help
   -v --version
@@ -49,8 +44,8 @@ GZ_TOPIC_COMPLETION_LIST="
   -i --info
   -e --echo
   -p --pub
-  --force-version
-  --versions
+  -v --version
+  --json-output
 "
 
 function _gz_service