From dc021ecaea1e99098186fc302044e91589225235 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Tue, 11 Jun 2024 20:48:48 +0200
Subject: [PATCH 01/12] quick try to make it compatible to bookworm

---
 conf/tomcat.service | 18 +++++++++---------
 manifest.toml       |  2 +-
 scripts/_common.sh  | 26 ++++++++++++++++----------
 scripts/change_url  |  2 +-
 scripts/install     | 18 +++++++++---------
 scripts/restore     | 10 +++++-----
 scripts/upgrade     | 18 +++++++++---------
 7 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/conf/tomcat.service b/conf/tomcat.service
index 1f1e0c9..fd777fe 100644
--- a/conf/tomcat.service
+++ b/conf/tomcat.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=Apache Tomcat 9 Web Application Server
 After=network.target
-RequiresMountsFor=/var/log/__APP__/tomcat __INSTALL_DIR__/var/lib/tomcat9
+RequiresMountsFor=/var/log/__APP__/tomcat __INSTALL_DIR__/var/lib/__TOMCAT_VERSION__
 
 [Service]
 
 # Configuration
-Environment="CATALINA_HOME=/usr/share/tomcat9"
-Environment="CATALINA_BASE=__INSTALL_DIR__/var/lib/tomcat9"
+Environment="CATALINA_HOME=/usr/share/__TOMCAT_VERSION__"
+Environment="CATALINA_BASE=__INSTALL_DIR__/var/lib/__TOMCAT_VERSION__"
 Environment="CATALINA_TMPDIR=/tmp"
 Environment="JAVA_OPTS=-Djava.awt.headless=true"
 Environment="GUACAMOLE_HOME=__INSTALL_DIR__/etc/guacamole"
@@ -15,13 +15,13 @@ Environment="GUACAMOLE_HOME=__INSTALL_DIR__/etc/guacamole"
 
 # Lifecycle
 Type=simple
-ExecStartPre=+/usr/libexec/tomcat9/tomcat-update-policy.sh
-ExecStart=/bin/sh /usr/libexec/tomcat9/tomcat-start.sh > /var/log/__APP__/tomcat/tomcat.log 2>&1
+ExecStartPre=+/usr/libexec/__TOMCAT_VERSION__/tomcat-update-policy.sh
+ExecStart=/bin/sh /usr/libexec/__TOMCAT_VERSION__/tomcat-start.sh > /var/log/__APP__/tomcat/tomcat.log 2>&1
 SuccessExitStatus=143
 Restart=on-abort
 
 # Logging
-SyslogIdentifier=__APP__-tomcat9
+SyslogIdentifier=__APP__-__TOMCAT_VERSION__
 
 # Security
 User=__APP__-tomcat
@@ -29,11 +29,11 @@ Group=__APP__-tomcat
 PrivateTmp=yes
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 NoNewPrivileges=true
-CacheDirectory=__APP__-tomcat9
+CacheDirectory=__APP__-__TOMCAT_VERSION__
 CacheDirectoryMode=750
 ProtectSystem=strict
-ReadWritePaths=__INSTALL_DIR__/etc/tomcat9/Catalina/
-ReadWritePaths=__INSTALL_DIR__/var/lib/tomcat9/webapps/
+ReadWritePaths=__INSTALL_DIR__/etc/__TOMCAT_VERSION__/Catalina/
+ReadWritePaths=__INSTALL_DIR__/var/lib/__TOMCAT_VERSION__/webapps/
 ReadWritePaths=/var/log/__APP__/tomcat/
 
 [Install]
diff --git a/manifest.toml b/manifest.toml
index 3a84dbe..2772401 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Guacamole"
 description.en = "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH"
 description.fr = "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH"
 
-version = "1.5.4~ynh1"
+version = "1.5.4~ynh2"
 
 maintainers = ["Jules Bertholet"]
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 11a92d5..ce9d645 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,6 +6,12 @@
 
 guacamole_version="1.5.4"
 
+if [ "$debian_maj_version" -eq 11 ] ; then
+    tomcat_version="tomcat9"
+elif [ "$debian_maj_version" -eq 12 ] ; then
+    tomcat_version="tomcat10"
+fi
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
@@ -18,18 +24,18 @@ function setup_sources {
 		tomcat_guac_dir="ROOT"
 	fi
 
-	ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$install_dir/downloads/tomcat9"
-	pushd "$install_dir/downloads/tomcat9" || ynh_die
-		ar x "tomcat9.deb" "data.tar.xz"
+	ynh_setup_source --source_id="$tomcat_version_deb" --dest_dir="$install_dir/downloads/$tomcat_version"
+	pushd "$install_dir/downloads/$tomcat_version" || ynh_die
+		ar x "$tomcat_version.deb" "data.tar.xz"
 		tar xJf data.tar.xz
 	popd || ynh_die
 	mkdir -p "$install_dir/etc"
-	cp -r "$install_dir/downloads/tomcat9/usr/share/tomcat9/etc" -T "$install_dir/etc/tomcat9/"
-	cp -r "$install_dir/downloads/tomcat9/etc/tomcat9/" -T "$install_dir/etc/tomcat9/"
+	cp -r "$install_dir/downloads/$tomcat_version/usr/share/$tomcat_version/etc" -T "$install_dir/etc/$tomcat_version/"
+	cp -r "$install_dir/downloads/$tomcat_version/etc/$tomcat_version/" -T "$install_dir/etc/$tomcat_version/"
 
 	ynh_setup_source --source_id="client" --dest_dir="$install_dir/downloads"
-	mkdir -p "$install_dir/var/lib/tomcat9/webapps"
-	mv "$install_dir/downloads/guacamole.war" "$install_dir/var/lib/tomcat9/webapps/$tomcat_guac_dir.war"
+	mkdir -p "$install_dir/var/lib/$tomcat_version/webapps"
+	mv "$install_dir/downloads/guacamole.war" "$install_dir/var/lib/$tomcat_version/webapps/$tomcat_guac_dir.war"
 
 	mkdir -p "$install_dir/etc/guacamole/extensions"
 
@@ -55,10 +61,10 @@ function _set_permissions() {
 	setfacl -n -R -m "user:$app-guacd:rx" -m "default:user:$app-guacd:rx" "$install_dir"
 	setfacl -n -R -m "user:$app-tomcat:rx" -m "default:user:$app-tomcat:rx" "$install_dir"
 
-	# chown -R nobody:$app-tomcat "$install_dir/etc/tomcat9/" "$install_dir/etc/guacamole/"
-	chown -R "$app-tomcat":"$app-tomcat" "$install_dir/var/lib/tomcat9/webapps"
+	# chown -R nobody:$app-tomcat "$install_dir/etc/$tomcat_version/" "$install_dir/etc/guacamole/"
+	chown -R "$app-tomcat":"$app-tomcat" "$install_dir/var/lib/$tomcat_version/webapps"
 	setfacl -n -R -m "user:$app-guacd:-" -m "default:user:$app-guacd:-" \
-		"$install_dir/var/lib/tomcat9/" "$install_dir/etc/guacamole/" "$install_dir/etc/tomcat9/"
+		"$install_dir/var/lib/$tomcat_version/" "$install_dir/etc/guacamole/" "$install_dir/etc/$tomcat_version/"
 
 	chown -R "$app-guacd:$app-guacd" "/var/log/$app/guacd/"
 	chown -R "$app-tomcat:$app-tomcat" "/var/log/$app/tomcat/"
diff --git a/scripts/change_url b/scripts/change_url
index cb11768..b65c972 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -44,7 +44,7 @@ if [ $change_path -eq 1 ]; then
 		new_path_tomcat="ROOT"
 	fi
 
-	mv "$install_dir/var/lib/tomcat9/webapps/$old_path_tomcat" "$install_dir/var/lib/tomcat9/webapps/$new_path_tomcat"
+	mv "$install_dir/var/lib/$tomcat_version/webapps/$old_path_tomcat" "$install_dir/var/lib/$tomcat_version/webapps/$new_path_tomcat"
 fi
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index bdc9698..7acb11e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -20,20 +20,20 @@ ynh_script_progression --message="Stopping system tomcat..." --weight=1
 
 tomcat_enabled=""
 tomcat_active=""
-if [ "$(systemctl cat tomcat9 --quiet)" ]; then
-	if (systemctl is-enabled tomcat9 --quiet); then
+if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
+	if (systemctl is-enabled $tomcat_version --quiet); then
 		tomcat_enabled=1
 	fi
-	if (systemctl is-active tomcat9 --quiet); then
+	if (systemctl is-active $tomcat_version --quiet); then
 		tomcat_active=1
 	fi
 fi
 
 if [ $tomcat_enabled ]; then
-	systemctl disable tomcat9 --quiet
+	systemctl disable $tomcat_version --quiet
 fi
 if [ $tomcat_active ]; then
-	systemctl stop tomcat9 --quiet
+	systemctl stop $tomcat_version --quiet
 fi
 
 #=================================================
@@ -55,9 +55,9 @@ setup_sources
 
 mkdir -p "/var/log/$app/tomcat/" "/var/log/$app/guacd/" "/var/log/$app/tomcat/"
 mkdir -p "$install_dir/etc/"
-ln -s -f "$install_dir/etc/tomcat9" "$install_dir/var/lib/tomcat9/conf"
-ln -s -f "/var/log/$app/tomcat/" "$install_dir/var/lib/tomcat9/logs"
-ln -s -f "/var/cache/$app-tomcat9" "$install_dir/var/lib/tomcat9/work"
+ln -s -f "$install_dir/etc/$tomcat_version" "$install_dir/var/lib/$tomcat_version/conf"
+ln -s -f "/var/log/$app/tomcat/" "$install_dir/var/lib/$tomcat_version/logs"
+ln -s -f "/var/cache/$app-$tomcat_version" "$install_dir/var/lib/$tomcat_version/work"
 
 #=================================================
 # ADD CONFIGURATIONS
@@ -65,7 +65,7 @@ ln -s -f "/var/cache/$app-tomcat9" "$install_dir/var/lib/tomcat9/work"
 
 ynh_add_config --template="guacamole.properties" --destination="$install_dir/etc/guacamole/guacamole.properties"
 
-ynh_replace_string --match_string="8080" --replace_string="$port" --target_file="$install_dir/etc/tomcat9/server.xml"
+ynh_replace_string --match_string="8080" --replace_string="$port" --target_file="$install_dir/etc/$tomcat_version/server.xml"
 
 _set_permissions
 
diff --git a/scripts/restore b/scripts/restore
index 7dcd68e..476bea3 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,20 +17,20 @@ ynh_script_progression --message="Stopping system tomcat..." --weight=1
 
 tomcat_enabled=""
 tomcat_active=""
-if [ "$(systemctl cat tomcat9 --quiet)" ]; then
-	if (systemctl is-enabled tomcat9 --quiet); then
+if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
+	if (systemctl is-enabled $tomcat_version --quiet); then
 		tomcat_enabled=1
 	fi
-	if (systemctl is-active tomcat9 --quiet); then
+	if (systemctl is-active $tomcat_version --quiet); then
 		tomcat_active=1
 	fi
 fi
 
 if [ ! $tomcat_enabled ]; then
-	systemctl disable tomcat9 --quiet
+	systemctl disable $tomcat_version --quiet
 fi
 if [ ! $tomcat_active ]; then
-	systemctl stop tomcat9 --quiet
+	systemctl stop $tomcat_version --quiet
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 63ed75e..7ccc7e9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,20 +65,20 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 tomcat_enabled=""
 tomcat_active=""
-if [ "$(systemctl cat tomcat9 --quiet)" ]; then
-	if (systemctl is-enabled tomcat9 --quiet); then
+if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
+	if (systemctl is-enabled $tomcat_version --quiet); then
 		tomcat_enabled=1
 	fi
-	if (systemctl is-active tomcat9 --quiet); then
+	if (systemctl is-active $tomcat_version --quiet); then
 		tomcat_active=1
 	fi
 fi
 
 if [ ! $tomcat_enabled ]; then
-	systemctl disable tomcat9 --quiet
+	systemctl disable $tomcat_version --quiet
 fi
 if [ ! $tomcat_active ]; then
-	systemctl stop tomcat9 --quiet
+	systemctl stop $tomcat_version --quiet
 fi
 
 #=================================================
@@ -99,9 +99,9 @@ popd
 #=================================================
 
 mkdir -p "$install_dir/etc/"
-ln -s -f "$install_dir/etc/tomcat9" "$install_dir/var/lib/tomcat9/conf"
-ln -s -f "/var/log/$app/tomcat/" "$install_dir/var/lib/tomcat9/logs"
-ln -s -f "/var/cache/$app-tomcat9" "$install_dir/var/lib/tomcat9/work"
+ln -s -f "$install_dir/etc/$tomcat_version" "$install_dir/var/lib/$tomcat_version/conf"
+ln -s -f "/var/log/$app/tomcat/" "$install_dir/var/lib/$tomcat_version/logs"
+ln -s -f "/var/cache/$app-$tomcat_version" "$install_dir/var/lib/$tomcat_version/work"
 
 #=================================================
 # CREATE LOG DIRS
@@ -115,7 +115,7 @@ mkdir -p "/var/log/$app/tomcat/" "/var/log/$app/guacd/" "/var/log/$app/tomcat/"
 
 ynh_add_config --template="guacamole.properties" --destination="$install_dir/etc/guacamole/guacamole.properties"
 
-ynh_replace_string --match_string="8080" --replace_string="$port" --target_file="$install_dir/etc/tomcat9/server.xml"
+ynh_replace_string --match_string="8080" --replace_string="$port" --target_file="$install_dir/etc/$tomcat_version/server.xml"
 
 #=================================================
 # SETUP SYSTEMD

From 140027c092c70dd8d65abd724a6ba0acd27b30b4 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:07:14 +0200
Subject: [PATCH 02/12] test ynh_debian_version

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ce9d645..0e7a776 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,9 +6,9 @@
 
 guacamole_version="1.5.4"
 
-if [ "$debian_maj_version" -eq 11 ] ; then
+if [ "$ynh_debian_version" == "bullseye" ] ; then
     tomcat_version="tomcat9"
-elif [ "$debian_maj_version" -eq 12 ] ; then
+elif [ "$ynh_debian_version" == "bookworm" ] ; then
     tomcat_version="tomcat10"
 fi
 

From 2e625eb58e959e4e5d3eb9166c6fd587909c8931 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:17:51 +0200
Subject: [PATCH 03/12] Fix debian variables

---
 scripts/_common.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0e7a776..b782cb1 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,9 +6,12 @@
 
 guacamole_version="1.5.4"
 
-if [ "$ynh_debian_version" == "bullseye" ] ; then
+
+debian_maj_version=$(sed 's/\..*//' /etc/debian_version)
+
+if [ "$debian_maj_version" -eq 11 ] ; then
     tomcat_version="tomcat9"
-elif [ "$ynh_debian_version" == "bookworm" ] ; then
+elif [ "$debian_maj_version" -eq 12 ] ; then
     tomcat_version="tomcat10"
 fi
 

From d1534eda75f21a2bb60daf975b54eb4a4090e48c Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:25:53 +0200
Subject: [PATCH 04/12] Fix variable

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index b782cb1..1532b82 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -27,7 +27,7 @@ function setup_sources {
 		tomcat_guac_dir="ROOT"
 	fi
 
-	ynh_setup_source --source_id="$tomcat_version_deb" --dest_dir="$install_dir/downloads/$tomcat_version"
+	ynh_setup_source --source_id="${tomcat_version}_deb" --dest_dir="$install_dir/downloads/$tomcat_version"
 	pushd "$install_dir/downloads/$tomcat_version" || ynh_die
 		ar x "$tomcat_version.deb" "data.tar.xz"
 		tar xJf data.tar.xz

From 096a7e7bfb6d20c02465e143b8a639dc108a2e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:08:07 +0200
Subject: [PATCH 05/12] add tomcat10 source

---
 manifest.toml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/manifest.toml b/manifest.toml
index 2772401..0c66e38 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -86,6 +86,13 @@ ram.runtime = "50M"
     extract = false
     rename = "tomcat9.deb"
 
+    [resources.sources.tomcat10_deb]
+    url = "https://ftp.debian.org/debian/pool/main/t/tomcat10/tomcat10_10.1.6-1+deb12u2_all.deb"
+    sha256 = "69cf85b0e9934314677a881a994a694c0f2fcf27065d520ef99305e53795f7f8"
+    format = "whatever"
+    extract = false
+    rename = "tomcat10.deb"
+
     [resources.ports]
     main.default = 8080
     guacd.default = 4822

From b743f92172dc8e359fc69e9b63b0e8689ed3784b Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:53:18 +0200
Subject: [PATCH 06/12] upgrade guacamole to 1.5.5

---
 manifest.toml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 0c66e38..5f63d86 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -50,27 +50,27 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
     [resources.sources.server]
-    url = "https://downloads.apache.org/guacamole/1.5.4/source/guacamole-server-1.5.4.tar.gz"
-    sha256 = "4c0add552b1fc387c23a35c430155e01f2dfcf9daa0f96fbf805d0ace756729e"
+    url = "https://downloads.apache.org/guacamole/1.5.5/source/guacamole-server-1.5.5.tar.gz"
+    sha256 = "67499611c2e22d9c933763adc5408e716a4bfd08a3eb8a5ba2fc6f8f70868f6b"
 
     [resources.sources.client]
-    url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-1.5.4.war"
-    sha256 = "5728b563911bd64bce0a0b81c74ea8ccb2190d1785bff34030fc6885a8273d3e"
+    url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-1.5.5.war"
+    sha256 = "4267307f3600663723f24af92d596e99c8359425315135052a42d451f9529200"
     format = "zip"
     extract = false
     rename = "guacamole.war"
 
     [resources.sources.auth-header]
-    url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-header-1.5.4.tar.gz"
-    sha256 = "7a0adc0daa19ec69a0244f491222c62124b02f81f40aa91e9a94d06a2635d038"
+    url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-header-1.5.5.tar.gz"
+    sha256 = "a39ca9563be6d31b4dc1251c76a62baeb2a9d4930b3055e342bb9ce80e526a78"
 
     [resources.sources.auth-ldap]
-    url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-ldap-1.5.4.tar.gz"
-    sha256 = "f912fe921cd0d429a752709e31a37b931e95d88a47bc4007ab49377d1c1a6336"
+    url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-ldap-1.5.5.tar.gz"
+    sha256 = "01d3cd74da5de9da9cc73a788ab2938dd44f5cbe42ad90eebb4bee07f246dfa3"
 
     [resources.sources.auth-jdbc]
-    url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-jdbc-1.5.4.tar.gz"
-    sha256 = "f45736b28eb6647b7eb0d2b48331e12e5a432661f61115b63d1a05a5bd20244d"
+    url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-jdbc-1.5.5.tar.gz"
+    sha256 = "80cca0a02076babad0dc7c76b60daa896f3d9bf10be82708f425fd42ce411393"
 
     [resources.sources.mariadb-java-client]
     url = "https://downloads.mariadb.com/Connectors/java/connector-java-2.7.4/mariadb-java-client-2.7.4.jar"

From f3627e7f08740bb5eb5334ceb7fc99781cb7c6ee Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:53:47 +0200
Subject: [PATCH 07/12] bump package version

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 5f63d86..44393ca 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Guacamole"
 description.en = "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH"
 description.fr = "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH"
 
-version = "1.5.4~ynh2"
+version = "1.5.5~ynh1"
 
 maintainers = ["Jules Bertholet"]
 

From bf0167c1634fa2b10afff0d3d23ee5d446c897c2 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 12 Jun 2024 14:06:22 +0200
Subject: [PATCH 08/12] oopsie for 1.5.5 update

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 1532b82..a4a9d7b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-guacamole_version="1.5.4"
+guacamole_version="$(ynh_app_upstream_version)"
 
 
 debian_maj_version=$(sed 's/\..*//' /etc/debian_version)

From 97e2d4cb5c0e274467b15be8a6f80a1f5d1e4a44 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 12 Jun 2024 14:31:49 +0200
Subject: [PATCH 09/12] Fix variable

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a4a9d7b..2de070e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-guacamole_version="$(ynh_app_upstream_version)"
+guacamole_version="1.5.5"
 
 
 debian_maj_version=$(sed 's/\..*//' /etc/debian_version)

From d2c190549be3600c86f35941d8e64f642c4ed339 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 5 Aug 2024 18:08:49 +0200
Subject: [PATCH 10/12] Fix clumsy check that tomcat is active/running ... if [
 $(cmd) ] or if [ $var ] is hella ambiguous ...

---
 scripts/install | 16 ++--------------
 scripts/restore | 15 ++-------------
 scripts/upgrade | 16 ++--------------
 3 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/scripts/install b/scripts/install
index 7acb11e..edda8a2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -17,22 +17,10 @@ ynh_script_progression --message="Stopping system tomcat..." --weight=1
 # Guacamole depends on Apache Tomcat.
 # But installing Tomcat from the Debian repos automatically enables and starts it.
 # So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
-
-tomcat_enabled=""
-tomcat_active=""
-if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
-	if (systemctl is-enabled $tomcat_version --quiet); then
-		tomcat_enabled=1
-	fi
-	if (systemctl is-active $tomcat_version --quiet); then
-		tomcat_active=1
-	fi
-fi
-
-if [ $tomcat_enabled ]; then
+if systemctl is-enabled $tomcat_version --quiet 2>/dev/null; then
 	systemctl disable $tomcat_version --quiet
 fi
-if [ $tomcat_active ]; then
+if systemctl is-active $tomcat_version --quiet 2>/dev/null; then
 	systemctl stop $tomcat_version --quiet
 fi
 
diff --git a/scripts/restore b/scripts/restore
index 476bea3..983c00c 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,21 +15,10 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Stopping system tomcat..." --weight=1
 
-tomcat_enabled=""
-tomcat_active=""
-if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
-	if (systemctl is-enabled $tomcat_version --quiet); then
-		tomcat_enabled=1
-	fi
-	if (systemctl is-active $tomcat_version --quiet); then
-		tomcat_active=1
-	fi
-fi
-
-if [ ! $tomcat_enabled ]; then
+if systemctl is-enabled $tomcat_version --quiet 2>/dev/null; then
 	systemctl disable $tomcat_version --quiet
 fi
-if [ ! $tomcat_active ]; then
+if systemctl is-active $tomcat_version --quiet 2>/dev/null; then
 	systemctl stop $tomcat_version --quiet
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 7ccc7e9..f2dbd7d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -62,22 +62,10 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1
 # Guacamole depends on Apache Tomcat.
 # But installing Tomcat from the Debian repos automatically enables and starts it.
 # So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
-
-tomcat_enabled=""
-tomcat_active=""
-if [ "$(systemctl cat $tomcat_version --quiet)" ]; then
-	if (systemctl is-enabled $tomcat_version --quiet); then
-		tomcat_enabled=1
-	fi
-	if (systemctl is-active $tomcat_version --quiet); then
-		tomcat_active=1
-	fi
-fi
-
-if [ ! $tomcat_enabled ]; then
+if systemctl is-enabled $tomcat_version --quiet 2>/dev/null; then
 	systemctl disable $tomcat_version --quiet
 fi
-if [ ! $tomcat_active ]; then
+if systemctl is-active $tomcat_version --quiet 2>/dev/null; then
 	systemctl stop $tomcat_version --quiet
 fi
 

From f42f29e0a873d5976cdae2889e95a0a01ef72ccb Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 5 Aug 2024 18:23:04 +0200
Subject: [PATCH 11/12] 'Not recommended' ? Why ? What the hell does this mean
 ? -_-

---
 manifest.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 44393ca..7ccc285 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -42,8 +42,6 @@ ram.runtime = "50M"
     type = "user"
 
     [install.init_main_permission]
-    help.en = "Not recommended"
-    help.fr = "Pas reccomandé"
     type = "group"
     default = "all_users"
 

From 35da73e872615ecf60909a402045d8eacdde13b2 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 5 Aug 2024 18:30:13 +0200
Subject: [PATCH 12/12] Cleaning up clumsy stuff

---
 scripts/_common.sh | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2de070e..966dd6d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,14 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-guacamole_version="1.5.5"
-
-
-debian_maj_version=$(sed 's/\..*//' /etc/debian_version)
-
-if [ "$debian_maj_version" -eq 11 ] ; then
+if [ "$YNH_DEBIAN_VERSION" == "bullseye" ] ; then
     tomcat_version="tomcat9"
-elif [ "$debian_maj_version" -eq 12 ] ; then
+elif [ "$YNH_DEBIAN_VERSION" == "bookworm" ] ; then
     tomcat_version="tomcat10"
 fi
 
@@ -23,15 +18,15 @@ function setup_sources {
 	ynh_setup_source --source_id="server" --dest_dir="$install_dir/.guacd-src"
 
 	tomcat_guac_dir="$path"
-	if [ "$path" == "/" -o -z "$path" ]; then
+	if [ "$path" == "/" ]; then
 		tomcat_guac_dir="ROOT"
 	fi
 
 	ynh_setup_source --source_id="${tomcat_version}_deb" --dest_dir="$install_dir/downloads/$tomcat_version"
-	pushd "$install_dir/downloads/$tomcat_version" || ynh_die
+	pushd "$install_dir/downloads/$tomcat_version"
 		ar x "$tomcat_version.deb" "data.tar.xz"
 		tar xJf data.tar.xz
-	popd || ynh_die
+	popd
 	mkdir -p "$install_dir/etc"
 	cp -r "$install_dir/downloads/$tomcat_version/usr/share/$tomcat_version/etc" -T "$install_dir/etc/$tomcat_version/"
 	cp -r "$install_dir/downloads/$tomcat_version/etc/$tomcat_version/" -T "$install_dir/etc/$tomcat_version/"
@@ -42,6 +37,7 @@ function setup_sources {
 
 	mkdir -p "$install_dir/etc/guacamole/extensions"
 
+    guacamole_version="$(ynh_app_upstream_version)"
 	ynh_setup_source --source_id="auth-ldap" --dest_dir="$install_dir/downloads/auth-ldap"
 	mv "$install_dir/downloads/auth-ldap/guacamole-auth-ldap-$guacamole_version.jar" "$install_dir/etc/guacamole/extensions/guacamole-auth-ldap.jar"
 
@@ -72,11 +68,3 @@ function _set_permissions() {
 	chown -R "$app-guacd:$app-guacd" "/var/log/$app/guacd/"
 	chown -R "$app-tomcat:$app-tomcat" "/var/log/$app/tomcat/"
 }
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================