Skip to content

Commit 2458b4f

Browse files
authored
Merge branch 'master' into pin-empy-version-in-ros-test
2 parents ece4d70 + 8fd32fb commit 2458b4f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

scripts/install/linux_compilation_dependencies.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ apt update
1515
apt install --yes git lsb-release cmake swig libglu1-mesa-dev libglib2.0-dev libfreeimage3 libfreetype6-dev libxml2-dev libboost-dev libssh-gcrypt-dev libzip-dev libreadline-dev pbzip2 wget zip unzip python3 python3-pip libopenal-dev
1616

1717
UBUNTU_VERSION=$(lsb_release -rs)
18-
if [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then
18+
if [[ $UBUNTU_VERSION == "20.04" ]]; then
19+
apt install --yes libzip5 perl libtext-template-perl
20+
elif [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then
1921
apt install --yes libzip4 openssl
2022
else
2123
echo "Unsupported Linux version: dependencies may not be completely installed. Only the two latest Ubuntu LTS are supported."

scripts/install/linux_runtime_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [[ -z "$DISPLAY" ]]; then
1818
fi
1919

2020
UBUNTU_VERSION=$(lsb_release -rs)
21-
if [[ $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then
21+
if [[ $UBUNTU_VERSION == "20.04" || $UBUNTU_VERSION == "22.04" || $UBUNTU_VERSION == "24.04" ]]; then
2222
apt install --yes ffmpeg
2323
else
2424
echo "Unsupported Linux version: dependencies may not be completely installed. Only the two latest Ubuntu LTS are supported."

0 commit comments

Comments
 (0)