From c1c6916d7d8fb9cb4e66ebae823e39aff49d3d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 25 Feb 2024 19:15:18 +0100 Subject: [PATCH] install tomcat before the rest --- scripts/_common.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a9de444..62e3f85 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,6 +18,14 @@ 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" + tar xJf data.tar.xz + popd || ynh_die + 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/" + ynh_setup_source --source_id="client" --dest_dir="$install_dir/downloads" ynh_exec_warn ls -lah "$install_dir/var/lib/tomcat9" mv "$install_dir/downloads/guacamole.war" "$install_dir/var/lib/tomcat9/webapps/$tomcat_guac_dir.war" @@ -36,14 +44,6 @@ function setup_sources { ynh_setup_source --source_id="mariadb-java-client" --dest_dir="$install_dir/etc/guacamole/lib/" - 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" - tar xJf data.tar.xz - popd || ynh_die - 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/" - ynh_secure_remove --file="$install_dir/downloads/" }