From 6ea9a77b08c2b03cd37ae7332ebb74739de29d71 Mon Sep 17 00:00:00 2001
From: Itiligent <94789708+itiligent@users.noreply.github.com>
Date: Tue, 29 Aug 2023 19:00:02 +1000
Subject: [PATCH] Debian 12 use old-stable tomcat9

---
 1-setup.sh | 11 +++++++++--
 README.md  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/1-setup.sh b/1-setup.sh
index e1d9606..d9aa305 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -246,6 +246,13 @@ echo -e "${LGREEN}"
 sudo chmod -R 770 $TMP_DIR
 sudo chown -R $SUDO_USER:root $TMP_DIR
 
+# A temporary workaround for current Debian 12 & Tomcat 10 incompatibilities (August 2023)
+if [[ $OS_FLAVOUR = "debian" ]] && [[ $OS_VERSION = *"bookworm"* ]]; then
+    # 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
+    TOMCAT_VERSION="tomcat9"
+fi
+
 #######################################################################################################################
 # Begin install menu prompts ##########################################################################################
 #######################################################################################################################
@@ -482,7 +489,7 @@ fi
 
 # Prompt to remove the trailing /guacamole dir from the default front end url
 if [ "${INSTALL_NGINX}" = false ]; then
-    echo -e -n "FRONT END: Set Guacamole url to http root (omit /guacamole/ from url ) [Y/n]? [default y]: "
+    echo -e -n "FRONT END: Set native Guacamole url to http root (omit /guacamole/ from url ) [Y/n]? [default y]: "
     read PROMPT
     if [[ ${PROMPT} =~ ^[Nn]$ ]]; then
         CHANGE_ROOT=false
@@ -574,7 +581,7 @@ echo
 echo -e "${LGREEN}Beginning Guacamole setup...${GREY}"
 echo
 echo -e "${GREY}Checking Linux distro specific dependencies..."
-if [[ $OS_FLAVOUR == "ubuntu" ]] || [[ $OS_FLAVOUR == "ubuntu"* ]]; then # potentially expand out distro choices here
+if [[ $OS_FLAVOUR == "ubuntu" ]] || [[ $OS_FLAVOUR == *"ubuntu"* ]]; then # potentially expand out distro choices here
     JPEGTURBO="libjpeg-turbo8-dev"
     LIBPNG="libpng-dev"
     # Just in case this repo is not added by default in the distro
diff --git a/README.md b/README.md
index 6f0e081..4b5c297 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# **Guacamole 1.5.3 VDI / Jump Server Appliance Build Script**
+# **Guacamole 1.5.3 VDI/Jump Server Appliance Build Script**
 
 A menu based source build & install script for Guacamole 1.5.3 with support for TLS reverse proxy, AD integration, multi-factor authentication and further security hardening.