Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions patch/ros-rolling-ros2cli.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/ros2cli/completion/ros2-argcomplete.bash b/ros2cli/completion/ros2-argcomplete.bash
index a5f2d67..ab9f656 100644
--- a/ros2cli/completion/ros2-argcomplete.bash
+++ b/ros2cli/completion/ros2-argcomplete.bash
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

-if type register-python-argcomplete3 > /dev/null 2>&1; then
- eval "$(register-python-argcomplete3 ros2)"
-elif type register-python-argcomplete > /dev/null 2>&1; then
+if type register-python-argcomplete > /dev/null 2>&1; then
eval "$(register-python-argcomplete ros2)"
fi
diff --git a/ros2cli/setup.py b/ros2cli/setup.py
index 232c5bc..d774f33 100644
--- a/ros2cli/setup.py
+++ b/ros2cli/setup.py
@@ -20,6 +20,14 @@ setup(
'completion/ros2-argcomplete.bash',
'completion/ros2-argcomplete.zsh'
]),
+
+ # [pixi] install autocompletion scripts
+ ('share/bash-completion/completions', [
+ 'completion/ros2-argcomplete.bash',
+ ]),
+ ('share/zsh/site-functions', [
+ 'completion/ros2-argcomplete.zsh'
+ ]),
],
zip_safe=False,
author='Dirk Thomas',
33 changes: 33 additions & 0 deletions patch/ros-rolling-rosidl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/rosidl_cli/completion/rosidl-argcomplete.bash b/rosidl_cli/completion/rosidl-argcomplete.bash
index 0262ec2..c3e8606 100644
--- a/rosidl_cli/completion/rosidl-argcomplete.bash
+++ b/rosidl_cli/completion/rosidl-argcomplete.bash
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

-if type register-python-argcomplete3 > /dev/null 2>&1; then
- eval "$(register-python-argcomplete3 rosidl)"
-elif type register-python-argcomplete > /dev/null 2>&1; then
+if type register-python-argcomplete > /dev/null 2>&1; then
eval "$(register-python-argcomplete rosidl)"
fi
diff --git a/rosidl_cli/setup.py b/rosidl_cli/setup.py
index bacc9e8..b4fd32c 100644
--- a/rosidl_cli/setup.py
+++ b/rosidl_cli/setup.py
@@ -20,6 +20,14 @@ setup(
'completion/rosidl-argcomplete.bash',
'completion/rosidl-argcomplete.zsh'
]),
+
+ # [pixi] install autocompletion scripts
+ ('share/bash-completion/completions', [
+ 'completion/rosidl-argcomplete.bash',
+ ]),
+ ('share/zsh/site-functions', [
+ 'completion/rosidl-argcomplete.zsh'
+ ]),
],
zip_safe=False,
author='Michel Hidalgo',
7 changes: 7 additions & 0 deletions tests/ros-rolling-ros2cli.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tests:
# Regression test for https://github.com/RoboStack/ros-humble/issues/271
- script:
- if: unix
then:
- test -f ${PREFIX}/share/bash-completion/completions/ros2-argcomplete.bash
- test -f ${PREFIX}/share/zsh/site-functions/ros2-argcomplete.zsh
7 changes: 7 additions & 0 deletions tests/ros-rolling-rosidl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tests:
# Regression test for https://github.com/RoboStack/ros-humble/issues/271
- script:
- if: unix
then:
- test -f ${PREFIX}/share/bash-completion/completions/rosidl-argcomplete.bash
- test -f ${PREFIX}/share/zsh/site-functions/rosidl-argcomplete.zsh