From b938b43f0984bfe44d8c9bd113eda574c1a92b90 Mon Sep 17 00:00:00 2001
From: Mihai Babiac <124875156+MihaiBSony@users.noreply.github.com>
Date: Wed, 16 Aug 2023 00:43:00 +0200
Subject: [PATCH] Fix incorrect argument forwarding with shell verbs (#748)

When used with bash, the previous approach would split each quoted
argument into multiple arguments, breaking commands such as
`catkin config --cmake-args -DCMAKE_CXX_FLAGS="-Ofast -DNDEBUG"`.
---
 catkin_tools/verbs/catkin_shell_verbs.bash | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/catkin_tools/verbs/catkin_shell_verbs.bash b/catkin_tools/verbs/catkin_shell_verbs.bash
index 640422f2..910c5b1f 100644
--- a/catkin_tools/verbs/catkin_shell_verbs.bash
+++ b/catkin_tools/verbs/catkin_shell_verbs.bash
@@ -54,11 +54,7 @@ function catkin() {
   fi
 
   # Capture original args
-  if [[ "$SHELL_EXT" == "bash" ]]; then
-      ORIG_ARGS=$@
-  else
-      ORIG_ARGS=(${@[*]})
-  fi
+  ORIG_ARGS=("$@")
 
   # Handle main arguments
   OPTSPEC=":hw-:"
@@ -100,6 +96,6 @@ function catkin() {
   case "${SUBCOMMAND}" in
     cd) cd "$($CATKIN locate $MAIN_ARGS $@)";;
     source) source "$($CATKIN locate $MAIN_ARGS -d)/setup.$SHELL_EXT";;
-    *) $CATKIN ${ORIG_ARGS}
+    *) $CATKIN "${ORIG_ARGS[@]}"
   esac
 }