From c3a8204ad236d6a97817cc1e73e5857d9e1995cd Mon Sep 17 00:00:00 2001
From: Alexander Rosenberg <zanderpkg@pm.me>
Date: Mon, 17 Feb 2025 00:13:11 -0800
Subject: [PATCH] Update lazy-ros2.zsh
---
lazy-ros2.zsh | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/lazy-ros2.zsh b/lazy-ros2.zsh
index 357526c..39b7576 100644
--- a/lazy-ros2.zsh
+++ b/lazy-ros2.zsh
@@ -1,21 +1,12 @@
# Lazy-load ros2 stuff
-function __zsh_load_ros2 {
- export AMENT_PREFIX_PATH=/opt/ros/humble
- export CMAKE_PREFIX_PATH=/opt/ros/humble
- export COLCON_PREFIX_PATH=/opt/ros/humble
- export ROS_DISTRO=humble
- export ROS_LOCALHOST_ONLY=0
- export ROS_PYTHON_VERSION=3
- export ROS_VERSION=2
- export LD_LIBRARY_PATH="/opt/ros/humble/opt/rviz_ogre_vendor/lib:/opt/ros/humble/lib:${LD_LIBRARY_PATH}"
- export PATH="/opt/ros/humble/bin:${PATH}"
- export PKG_CONFIG_PATH="/opt/ros/humble/lib/pkgconfig:${PKG_CONFIG_PATH}"
- export PYTHONPATH="/opt/ros/humble/lib/python3.13/dist-packages/:/opt/ros/humble/lib/python3.13/site-packages:${PYTHONPATH}"
-}
-
(( ${+ZSH_ROS2_ROOT} )) || return
+# Define as a function so it can be overridden for speed
+function zsh-load-ros2() {
+ source "${ZSH_ROS2_ROOT}/setup.zsh"
+}
+
local defined=()
local file
@@ -37,7 +28,7 @@ for exec in ${defined}; do
printf 'Setting up ros2 with \"%s\"...\n\n' \\
\"\${(q)ZSH_ROS2_ROOT%/}/setup.zsh\"
unfunction ${undef_args}
- __zsh_load_ros2 ||
+ zsh-load-ros2 ||
{ echo 'Failed to load ros2 libraries!'; return }
(( \${#} == 0 )) && ${(q)exec} || ${(q)exec} \"\${@}\"
}"