Skip to content

Commit

Permalink
polish
Browse files Browse the repository at this point in the history
  • Loading branch information
woensug-choi committed Jun 16, 2024
1 parent 63ee386 commit 00b41ab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
7 changes: 6 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,16 @@ sed -i '' "s|VIRTUAL_ENV_ROOT|$VIRTUAL_ENV_ROOT|g" setenv.sh
# Rename sentenv.sh to activate_ros
if [ -f activate_ros ]; then
rm activate_ros
mv setenv.sh activate_ros
fi
mv setenv.sh activate_ros

# Activate it
# shellcheck disable=SC1090
. "$HOME/$ROS_INSTALL_ROOT"/activate_ros

# Print post messages
echo -e "\033[32m\nDone.🍎 (Apple Silicon) + 🤖 = 🚀❤️🤩🎉🥳 \033[0m"
echo -e "\033[32m\nTry 'ros2' or 'rviz' in the terminal to start ROS2 Jazzy. \033[0m"
echo
echo "To activate the new ROS2 distribution run the following command:"
echo -e "\033[32m. $HOME/$ROS_INSTALL_ROOT/activate_ros\033[0m"
Expand Down
12 changes: 6 additions & 6 deletions setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ function deactivate_ros() {
}

# Source Virtual Environment
# shellcheck disable=SC1090
source "$HOME/$VIRTUAL_ENV_ROOT/bin/activate"
# shellcheck disable=SC1091
source "$HOME/VIRTUAL_ENV_ROOT/bin/activate"

# Source ROS
if [[ $SHELL == *"bash"* ]]; then
# shellcheck disable=SC1090
source "$HOME/$ROS_INSTALL_ROOT/install/setup.bash"
# shellcheck disable=SC1091
source "$HOME/ROS_INSTALL_ROOT/install/setup.bash"
elif [[ $SHELL == *"zsh"* ]]; then
# shellcheck disable=SC1090
source "$HOME/$ROS_INSTALL_ROOT/install/setup.zsh"
# shellcheck disable=SC1091
source "$HOME/ROS_INSTALL_ROOT/install/setup.zsh"
else
echo "Unsupported shell. Please use bash or zsh."
exit 1
Expand Down

0 comments on commit 00b41ab

Please sign in to comment.