From 4253a7c2a1270ee320298db5d913080f85989b6f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 5 Aug 2024 18:56:27 +0200
Subject: [PATCH] Remove the need to have tomcat as source in manifest.toml

---
 manifest.toml      | 14 --------------
 scripts/_common.sh |  7 +++++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 033a7fc..9f53082 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -77,20 +77,6 @@ ram.runtime = "50M"
     extract = false
     rename = "mariadb-java-client.jar"
 
-    [resources.sources.tomcat9_deb]
-    url = "https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u10_all.deb"
-    sha256 = "0dd30fee78ecd3980e9ee3ba018071755ddf84e2288b860900709f1013e368ed"
-    format = "whatever"
-    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
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 966dd6d..7c353d9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -22,9 +22,12 @@ function setup_sources {
 		tomcat_guac_dir="ROOT"
 	fi
 
-	ynh_setup_source --source_id="${tomcat_version}_deb" --dest_dir="$install_dir/downloads/$tomcat_version"
+    mkdir -p $install_dir/downloads/$tomcat_version
 	pushd "$install_dir/downloads/$tomcat_version"
-		ar x "$tomcat_version.deb" "data.tar.xz"
+        apt-get download $tomcat_version
+        # Gotta use eval such that the wildcard works zbgmpf
+        eval "mv tomcat*.deb tomcat.deb"
+		ar x "tomcat.deb" "data.tar.xz"
 		tar xJf data.tar.xz
 	popd
 	mkdir -p "$install_dir/etc"