diff --git a/scripts/install.sh b/scripts/install.sh index 75e50065d..1af687dee 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -210,7 +210,35 @@ fi cat </dev/null + +sudo apt update +sudo apt upgrade + +mil_system_install ros-foxy-desktop python3-argcomplete + +mil_system_install ros-dev-tools + +mil_system_install ros-foxy-ros1-bridge + +# Restore path +cd ~/catkin_ws/src/mil/ + +cat <>~/.zshrc fi else - # User is using zsh + # User is using bash if grep -Fq "$BASH_RC_LINES" ~/.bashrc; then echo "milrc is already sourced in ~/.bashrc, skipping" else diff --git a/scripts/setup.bash b/scripts/setup.bash index fa3d442af..9f6e4d04a 100755 --- a/scripts/setup.bash +++ b/scripts/setup.bash @@ -201,3 +201,6 @@ export PYTHONPATH="${HOME}/catkin_ws/src/mil/mil_common/perception/vision_stack/ # Ensure that VRX does _not_ exit on completion, as we're not in a time-limited # environment, and exiting too early would not let us debug as much! export VRX_EXIT_ON_COMPLETION=0 + +export ROS1_INSTALL_PATH=/opt/ros/noetic +export ROS2_INSTALL_PATH=/opt/ros/foxy