From 3ccab8345c1fc095ec5435ba0f59235eb8b91dcd Mon Sep 17 00:00:00 2001
From: pcjx <109846435+pcjx@users.noreply.github.com>
Date: Sun, 24 Jul 2022 01:49:41 +0200
Subject: [PATCH] Make ubuntu_setup.sh use codenames to support Ubuntu based
 distros (#25261)

Using codenames allows the ubuntu_setup.sh to install
properly on systems like Pop!_OS or Linux Mint.
old-commit-hash: 551d2fe511ac2801befaa93d525b5c8bdb608629
---
 tools/ubuntu_setup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh
index 5bc3630766..bd12b878f1 100755
--- a/tools/ubuntu_setup.sh
+++ b/tools/ubuntu_setup.sh
@@ -69,7 +69,7 @@ function install_ubuntu_common_requirements() {
 }
 
 # Install Ubuntu 22.04 LTS packages
-function install_ubuntu_latest_requirements() {
+function install_ubuntu_jammy_requirements() {
   install_ubuntu_common_requirements
 
   sudo apt-get install -y --no-install-recommends \
@@ -81,7 +81,7 @@ function install_ubuntu_latest_requirements() {
 }
 
 # Install Ubuntu 20.04 packages
-function install_ubuntu_lts_requirements() {
+function install_ubuntu_focal_requirements() {
   install_ubuntu_common_requirements
 
   sudo apt-get install -y --no-install-recommends \
@@ -93,12 +93,12 @@ function install_ubuntu_lts_requirements() {
 # Detect OS using /etc/os-release file
 if [ -f "/etc/os-release" ]; then
   source /etc/os-release
-  case "$ID $VERSION_ID" in
-    "ubuntu 22.04")
-      install_ubuntu_latest_requirements
+  case "$VERSION_CODENAME" in
+    "jammy")
+      install_ubuntu_jammy_requirements
       ;;
-    "ubuntu 20.04")
-      install_ubuntu_lts_requirements
+    "focal")
+      install_ubuntu_focal_requirements
       ;;
     *)
       echo "$ID $VERSION_ID is unsupported. This setup script is written for Ubuntu 20.04."
@@ -107,7 +107,7 @@ if [ -f "/etc/os-release" ]; then
       if [[ ! $REPLY =~ ^[Yy]$ ]]; then
         exit 1
       fi
-      install_ubuntu_lts_requirements
+      install_ubuntu_focal_requirements
   esac
 else
   echo "No /etc/os-release in the system"