From c3174b5dec898da3c58681b51970a65e473c2840 Mon Sep 17 00:00:00 2001 From: Benjamin Perseghetti Date: Wed, 28 Dec 2022 10:16:43 -0500 Subject: [PATCH] Tools/setup/ubuntu.sh: Fixes install for 22.04 gazebo (#20833) Fixes ubuntu installation script for 22.04 to only install gazebo. Signed-off-by: Benjamin Perseghetti --- Tools/setup/ubuntu.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh index b17539de6f..1a6e14a66d 100755 --- a/Tools/setup/ubuntu.sh +++ b/Tools/setup/ubuntu.sh @@ -73,7 +73,7 @@ elif [[ "${UBUNTU_RELEASE}" == "20.04" ]]; then elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then echo "Ubuntu 22.04, simulation build off by default." echo "Use --sim_jammy to enable simulation build." - INSTALL_SIM=$INSTALL_SIM_JAMMY + INSTALL_SIM="false" fi @@ -230,7 +230,7 @@ if [[ $INSTALL_SIM == "true" ]]; then gazebo_version=9 gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev" elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then - gazebo_packages="gazebo libgazebo-dev" + gazebo_packages="ignition-fortress" else # default and Ubuntu 20.04 gazebo_version=11 @@ -264,6 +264,16 @@ if [[ $INSTALL_SIM == "true" ]]; then fi fi +if [[ $INSTALL_SIM_JAMMY == "true" ]]; then + sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' + wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - + # Update list, since new gazebo-stable.list has been added + sudo apt-get update -y --quiet + sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends install \ + ignition-fortress \ + ; +fi + if [[ $INSTALL_NUTTX == "true" ]]; then echo echo "Relogin or reboot computer before attempting to build NuttX targets"