fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 02:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu.sh: only add gazebo source once on 22.04

Browse Source
This commit is contained in:
Matthias Grob
2023-02-23 09:58:10 +01:00
parent 76aac7a5e5
commit dabf33759b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/setup/ubuntu.sh
+6 -8
View File
@@ -217,12 +217,14 @@ if [[ $INSTALL_SIM == "true" ]]; then
# Set Java 11 as default # Set Java 11 as default
sudo update-alternatives --set java $(update-alternatives --list java | grep "java-$java_version") sudo update-alternatives --set java $(update-alternatives --list java | grep "java-$java_version")
# Add Gazebo binary repository
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
# Install Gazebo # Install Gazebo
if [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then if [[ "${UBUNTU_RELEASE}" == "22.04" ]]; 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 \ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends install \
ignition-fortress \ ignition-fortress \
; ;
@@ -240,10 +242,6 @@ if [[ $INSTALL_SIM == "true" ]]; then
gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev" gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev"
fi fi
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 \ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends install \
dmidecode \ dmidecode \
$gazebo_packages \ $gazebo_packages \