diff --git a/interbotix_ros_xsarms/install/amd64/xsarm_amd64_install.sh b/interbotix_ros_xsarms/install/amd64/xsarm_amd64_install.sh index d7302086..5e62106f 100755 --- a/interbotix_ros_xsarms/install/amd64/xsarm_amd64_install.sh +++ b/interbotix_ros_xsarms/install/amd64/xsarm_amd64_install.sh @@ -17,13 +17,13 @@ RRE="${NORM}${OFF}" PROMPT="> " -ALL_VALID_DISTROS=('melodic' 'noetic' 'galactic' 'humble') +ALL_VALID_DISTROS=('melodic' 'noetic' 'galactic' 'humble' 'rolling') ROS1_VALID_DISTROS=('melodic' 'noetic') -ROS2_VALID_DISTROS=('galactic' 'humble') +ROS2_VALID_DISTROS=('galactic' 'humble' 'rolling') BIONIC_VALID_DISTROS=('melodic') FOCAL_VALID_DISTROS=('noetic' 'galactic') -JAMMY_VALID_DISTROS=('humble') +JAMMY_VALID_DISTROS=('humble' 'rolling') NONINTERACTIVE=false DISTRO_SET_FROM_CL=false @@ -415,6 +415,16 @@ if [ "$NONINTERACTIVE" = false ]; then INSTALL_MATLAB=false fi + if [[ "$ROS_DISTRO_TO_INSTALL" == 'rolling' ]]; then + echo -e "${BLU}${BOLD}ROS 2 Rolling is not officially supported and full functionality is not guaranteed. Do you wish to continue anyways?\n$PROMPT${NORM}${OFF}\c" + read -r resp + if [[ $resp == [yY] || $resp == [yY][eE][sS] ]]; then + : + else + help && exit 0 + fi + fi + echo -e "${BLU}${BOLD}INSTALLATION SUMMARY:" echo -e "\tROS Distribution: ROS ${ROS_VERSION_TO_INSTALL} ${ROS_DISTRO_TO_INSTALL}" echo -e "\tInstall Perception Modules: ${INSTALL_PERCEPTION}" diff --git a/interbotix_ros_xsarms/install/rpi4/xsarm_rpi4_install.sh b/interbotix_ros_xsarms/install/rpi4/xsarm_rpi4_install.sh index 2b792cf3..494e4faf 100755 --- a/interbotix_ros_xsarms/install/rpi4/xsarm_rpi4_install.sh +++ b/interbotix_ros_xsarms/install/rpi4/xsarm_rpi4_install.sh @@ -13,13 +13,13 @@ RRE="${NORM}${OFF}" PROMPT="> " -ALL_VALID_DISTROS=('melodic' 'noetic' 'galactic' 'humble') +ALL_VALID_DISTROS=('melodic' 'noetic' 'galactic' 'humble' 'rolling') ROS1_VALID_DISTROS=('melodic' 'noetic') -ROS2_VALID_DISTROS=('galactic' 'humble') +ROS2_VALID_DISTROS=('galactic' 'humble' 'rolling') BIONIC_VALID_DISTROS=('melodic') FOCAL_VALID_DISTROS=('noetic' 'galactic') -JAMMY_VALID_DISTROS=('humble') +JAMMY_VALID_DISTROS=('humble' 'rolling') NONINTERACTIVE=false INSTALL_PATH=~/interbotix_ws @@ -395,6 +395,16 @@ if [ "$NONINTERACTIVE" = false ]; then fi fi + if [[ "$ROS_DISTRO_TO_INSTALL" == 'rolling' ]]; then + echo -e "${BLU}${BOLD}ROS 2 Rolling is not officially supported and full functionality is not guaranteed. Do you wish to continue anyways?\n$PROMPT${NORM}${OFF}\c" + read -r resp + if [[ $resp == [yY] || $resp == [yY][eE][sS] ]]; then + : + else + help && exit 0 + fi + fi + echo -e "${BLU}${BOLD}RASPBERRY PI INSTALLATION SUMMARY:" echo -e "\tROS Distribution: ROS ${ROS_VERSION_TO_INSTALL} ${ROS_DISTRO_TO_INSTALL}" echo -e "\tRun joystick control on boot: ${RUN_JOY_AT_BOOT}"