From f3cf064c068d365fa421f1b361f47947f77cf67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Sun, 16 Oct 2022 17:52:57 +0200 Subject: [PATCH] Enable humble on Ubuntu 20.04 and creation of humble dockers. (#79) --- scripts/_RosTeamWs_Defines.bash | 4 +++- scripts/docker/_RosTeamWs_Docker_Defines.bash | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/_RosTeamWs_Defines.bash b/scripts/_RosTeamWs_Defines.bash index 92734209..eac5b78e 100755 --- a/scripts/_RosTeamWs_Defines.bash +++ b/scripts/_RosTeamWs_Defines.bash @@ -374,9 +374,11 @@ function check_ros_distro { local upper_case=$(echo $ros_distro | tr '[:lower:]' '[:upper:]') local alternative_ros_location=ALTERNATIVE_ROS_${upper_case}_LOCATION if [ ! -f "${!alternative_ros_location}/setup.bash" ]; then + notify_user "You are possibly trying to run unsupported ROS distro ('$ros_distro') for your version of Ubuntu. Please set ${alternative_ros_location} variable, e.g., 'export ${alternative_ros_location}=/opt/ros/rolling/setup.bash'. The best is to add that line somewhere at the beginning of the '~/.ros_team_ws_rc' file." + print_and_exit "FATAL: ROS '$ros_distro' not installed on this computer! Exiting..." else - user_decision "Using ${ALTERNATIVE_ROS_LOCATION} for ${ros_distro}." user_answer + user_decision "Using ${alternative_ros_location} for ${ros_distro}." user_answer # check if the chosen ros-distro location is correct. if [[ " ${negative_answers[*]} " =~ " ${user_answer} " ]]; then print_and_exit "Please set your ALTERNATIVE_ROS_LOCATION to the correct location. Exiting..." diff --git a/scripts/docker/_RosTeamWs_Docker_Defines.bash b/scripts/docker/_RosTeamWs_Docker_Defines.bash index c0321248..dbd67b7f 100755 --- a/scripts/docker/_RosTeamWs_Docker_Defines.bash +++ b/scripts/docker/_RosTeamWs_Docker_Defines.bash @@ -19,8 +19,8 @@ source $docker_script_own_dir/../_RosTeamWs_Defines.bash # assoziative array which maps the chosen rosdistro to the name which is used to install the corresponding # ros distribution inside docker -declare -r -A map_to_docker_ros_distro_name=( ["foxy"]="foxy" ["galactic"]="galactic" ["rolling"]="rolling" ) -declare -r -A ros_distro_to_rtw_branch=( ["foxy"]="foxy" ["galactic"]="master" ["rolling"]="master") +declare -r -A map_to_docker_ros_distro_name=( ["foxy"]="foxy" ["galactic"]="galactic" ["rolling"]="rolling" ["humble"]="humble") +declare -r -A ros_distro_to_rtw_branch=( ["foxy"]="foxy" ["galactic"]="master" ["rolling"]="master" ["humble"]="master") # $1 = name (tag) of the created docker image # $2 = Dockerfile which is used for creating the image