Skip to content

Commit 0d0be60

Browse files
committed
Tools: environment_install: make sure Linux Mint dist is always mapped
... to an Uubntu release. Saves confusion on newer Mint releases as thje install will fail with a clear message rather than get confused on packages
1 parent b634a40 commit 0d0be60

File tree

1 file changed

+30
-15
lines changed

1 file changed

+30
-15
lines changed

Tools/environment_install/install-prereqs-ubuntu.sh

+30-15
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,37 @@ fi
6060
# Checking Ubuntu release to adapt software version to install
6161
RELEASE_CODENAME=$(lsb_release -c -s)
6262

63-
# translate Mint-codenames to Ubuntu-codenames based on https://www.linuxmint.com/download_all.php
64-
case ${RELEASE_CODENAME} in
65-
wilma | xia)
66-
RELEASE_CODENAME='noble'
63+
RELEASE_DISTRIBUTOR=$(lsb_release -i -s)
64+
case ${RELEASE_DISTRIBUTOR} in
65+
elementary)
66+
case ${RELEASE_CODENAME} in
67+
jolnir)
68+
RELEASE_CODENAME='focal'
69+
;;
70+
esac
6771
;;
68-
vanessa | vera | victoria | virginia)
69-
RELEASE_CODENAME='jammy'
70-
;;
71-
una | uma | ulyssa | ulyana | jolnir)
72-
RELEASE_CODENAME='focal'
73-
;;
74-
tricia | tina | tessa | tara)
75-
RELEASE_CODENAME='bionic'
76-
;;
77-
elsie)
78-
RELEASE_CODENAME='bullseye'
72+
LinuxMint)
73+
# translate Mint-codenames to Ubuntu-codenames based on https://www.linuxmint.com/download_all.php
74+
case ${RELEASE_CODENAME} in
75+
wilma | xia)
76+
RELEASE_CODENAME='noble'
77+
;;
78+
vanessa | vera | victoria | virginia)
79+
RELEASE_CODENAME='jammy'
80+
;;
81+
una | uma | ulyssa | ulyana)
82+
RELEASE_CODENAME='focal'
83+
;;
84+
tricia | tina | tessa | tara)
85+
RELEASE_CODENAME='bionic'
86+
;;
87+
elsie)
88+
RELEASE_CODENAME='bullseye'
89+
;;
90+
*)
91+
echo "Unable to map ${RELEASE_CODENAME} to an Ubuntu release. Please patch this script and submit a pull request, or report at https://github.com/ArduPilot/ardupilot/issues"
92+
exit 1
93+
esac
7994
;;
8095
esac
8196

0 commit comments

Comments
 (0)