Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 19:32:36 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

ubuntu.sh: always install "Gazebo" next to "Gazebo classic" on 22.04

Browse Source
This commit is contained in:
Matthias Grob
2023-01-05 17:13:21 +01:00
committed by Daniel Agar
parent 91e97eded9
commit 19cee04f3a
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/setup/ubuntu.sh
+11 -16
View File
@@ -14,7 +14,6 @@ set -e
INSTALL_NUTTX="true" INSTALL_NUTTX="true"
INSTALL_SIM="true" INSTALL_SIM="true"
INSTALL_ARCH=`uname -m` INSTALL_ARCH=`uname -m`
INSTALL_SIM_IGNITION="false"
# Parse arguments # Parse arguments
for arg in "$@" for arg in "$@"
@@ -26,11 +25,6 @@ do
if [[ $arg == "--no-sim-tools" ]]; then if [[ $arg == "--no-sim-tools" ]]; then
INSTALL_SIM="false" INSTALL_SIM="false"
fi fi
if [[ $arg == "--sim-ignition" ]]; then
INSTALL_SIM_IGNITION="true"
fi
done done
# detect if running in docker # detect if running in docker
@@ -223,7 +217,7 @@ 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")
# Gazebo # Install Gazebo classic
if [[ "${UBUNTU_RELEASE}" == "18.04" ]]; then if [[ "${UBUNTU_RELEASE}" == "18.04" ]]; then
gazebo_version=9 gazebo_version=9
gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev" gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev"
@@ -260,16 +254,17 @@ if [[ $INSTALL_SIM == "true" ]]; then
# fix VMWare 3D graphics acceleration for gazebo # fix VMWare 3D graphics acceleration for gazebo
echo "export SVGA_VGPU10=0" >> ~/.profile echo "export SVGA_VGPU10=0" >> ~/.profile
fi fi
fi
if [[ $INSTALL_SIM_IGNITION == "true" ]]; then # Install Gazebo
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' if [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
# Update list, since new gazebo-stable.list has been added wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
sudo apt-get update -y --quiet # Update list, since new gazebo-stable.list has been added
sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends install \ sudo apt-get update -y --quiet
ignition-fortress \ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends install \
; ignition-fortress \
;
fi
fi fi
if [[ $INSTALL_NUTTX == "true" ]]; then if [[ $INSTALL_NUTTX == "true" ]]; then