From 0b84ef6a56d097949db4df30cbaa3ad898c3e78e Mon Sep 17 00:00:00 2001
From: Itiligent <94789708+itiligent@users.noreply.github.com>
Date: Sat, 15 Jun 2024 12:54:17 +1000
Subject: [PATCH] add support for Ubuntu 24.04 LTS

---
 1-setup.sh | 20 ++++++++++++++------
 README.md  |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/1-setup.sh b/1-setup.sh
index 4499d7b..21b2d35 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -188,7 +188,7 @@ echo
 sudo apt-get update -qq &> /dev/null
 
 #######################################################################################################################
-# Package dependency handling and workarounds for various distros, MODIFY ONLY IF NEEDED ###############################
+# Package dependency handling and workarounds for various distros, MODIFY ONLY IF NEEDED ##############################
 #######################################################################################################################
 
 # Standardise on a distro version identification lexicon
@@ -229,26 +229,34 @@ if [[ $(apt-cache show tomcat10 2>/dev/null | egrep "Version: 10" | wc -l) -gt 0
     TOMCAT_VERSION="tomcat10"
 elif [[ $(apt-cache show tomcat9 2>/dev/null | egrep "Version: 9" | wc -l) -gt 0 ]]; then
     TOMCAT_VERSION="tomcat9"
-elif [[ $(apt-cache show tomcat8 2>/dev/null | egrep "Version: 8.[5-9]" | wc -l) -gt 0 ]]; then
-    TOMCAT_VERSION="tomcat8"
 else
     # Default to this version
     TOMCAT_VERSION="tomcat9"
 fi
 
-# Workaround for current Tomcat incompatibilities with Debian 12 (includes workaround for Debian 12 stable and testing repos)
+#######################################################################################################################
+# Ongoing fixes and workarounds as distros diverge/change #############################################################
+#######################################################################################################################
+
+# Workaround for Debian incompatibilities with latet Tomcat versions. (Add the oldstable repo and downgrade the Tomcat version to be installed)
 if [[ ${OS_NAME,,} = "debian" && ${OS_CODENAME,,} = *"bookworm"* ]] || [[ ${OS_NAME,,} = "debian" && ${OS_CODENAME,,} = *"trixie"* ]]; then #(checks for upper and lower case)
-    # Add the oldstable repo and downgrade tomcat version install
     echo "deb http://deb.debian.org/debian/ bullseye main" | sudo tee /etc/apt/sources.list.d/bullseye.list &> /dev/null
     sudo apt-get update -qq &> /dev/null
     TOMCAT_VERSION="tomcat9"
 fi
 
-# Workaround for Ubuntu 23.x & Tomcat 10 incompatibilities
+# Workaround for Ubuntu 23.x Tomcat 10 incompatibilities. Force older version 9 also found in the Lunar repo.
 if [[ ${OS_NAME,,} = "ubuntu" ]] && [[ ${OS_CODENAME,,} = *"lunar"* ]]; then  #(checks for upper and lower case)
     TOMCAT_VERSION="tomcat9"
 fi
 
+# Workaround for Ubuntu 24.x Tomcat 10 incompatibilities, add old Jammy repo and downgrade the Tomcat version to be installed
+if [[ ${OS_NAME,,} = "ubuntu" && ${OS_CODENAME,,} = *"noble"* ]]; then #(checks for upper and lower case)
+    echo "deb http://archive.ubuntu.com/ubuntu/ jammy universe" | sudo tee /etc/apt/sources.list.d/jammy.list &> /dev/null
+    sudo apt-get update -qq &> /dev/null
+    TOMCAT_VERSION="tomcat9"
+fi
+
 # Uncomment here to force a specific Tomcat version.
 # TOMCAT_VERSION="tomcat9"
 
diff --git a/README.md b/README.md
index 249aa2d..0dafdee 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ wget https://raw.githubusercontent.com/itiligent/Guacamole-Install/main/1-setup.
 <img src="https://github.githubassets.com/images/icons/emoji/lock.png" width="23"> **Before diving in, make sure you have:**
 
 - **A compatible OS (with sudo & wget packages installed):**
-    - **Debian 12, 11 or 10**
-    - **Ubuntu 23.04, 22.04, 20.04**
+    - **Debian: 12.x, 11.x 10.x**
+    - **Ubuntu LTS variants: 24.04, 23.04, 22.04, 20.04**
     - **Raspbian Buster or Bullseye**
     - **Official vendor cloud images equivalent to the above versions.** 
       - (if your cloud image uses an IP of 127.0.1.1, [see here to use TLS with Nginx](https://github.com/itiligent/Guacamole-Install/issues/21))