Enable humble on Ubuntu 20.04 and creation of humble dockers. (StoglR…

…obotics#79)
Robotgir · Oct 16, 2022 · f3cf064 · f3cf064
1 parent a03acce
commit f3cf064
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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