From 8b30ec3726bb6e2655a479a57a42d274c6080786 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 20 Feb 2015 18:52:25 +0000 Subject: [PATCH] zsh: export ROS_DISTRO --- zsh/functions/rosinit | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zsh/functions/rosinit b/zsh/functions/rosinit index ac985a8..082f156 100644 --- a/zsh/functions/rosinit +++ b/zsh/functions/rosinit @@ -5,13 +5,14 @@ function rosinit() { local -a ROS_DISTROS ROS_DISTROS=("hydro" "indigo") - local ROS_DISTRO=$1 - if [[ -z "$ROS_DISTRO" ]]; then + local distro=$1 + if [[ -z "$distro" ]]; then for d in "${ROS_DISTROS[@]}"; do - [[ -f "/opt/ros/$d/setup.zsh" ]] && ROS_DISTRO=$d + [[ -f "/opt/ros/$d/setup.zsh" ]] && distro=$d done fi - if [[ -f "/opt/ros/$ROS_DISTRO/setup.zsh" ]]; then + if [[ -f "/opt/ros/$distro/setup.zsh" ]]; then + export ROS_DISTRO=$distro export ROS_OS_OVERRIDE=arch source /opt/ros/$ROS_DISTRO/setup.zsh source $WORKSPACE/devel/setup.zsh @@ -21,6 +22,6 @@ function rosinit() { # export ROS_TEST_RESULTS_DIR=$HOME/.ros roscd else - echo "ROS $ROS_DISTRO doesn't seem to be installed." >&2 + echo "ROS $distro doesn't seem to be installed." >&2 fi } -- 2.48.1