YunoHost-Apps/guacamole_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/guacamole_ynh.git synced 2024-09-03 19:16:03 +02:00
Code Issues Activity Actions

Remove the need to have tomcat as source in manifest.toml

Browse source
This commit is contained in:
Alexandre Aubin 2024-08-05 18:56:27 +02:00
parent 5cbf57532a
commit 4253a7c2a1
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
manifest.toml
View file

@ -77,20 +77,6 @@ ram.runtime = "50M"
extract = false extract = false
rename = "mariadb-java-client.jar" 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] [resources.ports]
main.default = 8080 main.default = 8080
guacd.default = 4822 guacd.default = 4822

7
scripts/_common.sh
View file

@ -22,9 +22,12 @@ function setup_sources {
tomcat_guac_dir="ROOT" tomcat_guac_dir="ROOT"
fi 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" 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 tar xJf data.tar.xz
popd popd
mkdir -p "$install_dir/etc" mkdir -p "$install_dir/etc"