From 0be8e98f08a8e8fdad7a289c60229137bf32e79c Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:23:32 +0200 Subject: [PATCH] use resources for deb --- manifest.toml | 20 +++++++++----------- scripts/_common.sh | 11 ++--------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3a50d3c..343e5c5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -74,17 +74,15 @@ ram.runtime = "800M" "libcurl4-openssl-dev", ] - # Manual install in scripts - # [resources.apt.extras.ttf] - # repo = "deb http://deb.debian.org/debian/ bullseye main contrib" - # key = "https://ftp-master.debian.org/keys/release-bullseye.asc" - # packages = ["ttf-mscorefonts-installer"] - - # Manual install in scripts - # [resources.apt.extras.onlyoffice] - # repo = "https://download.onlyoffice.com/repo/debian squeeze main" - # key = "https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" - # packages = "onlyoffice-documentserver" + [resources.sources.main] + amd64.url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v8.0.1/onlyoffice-documentserver_amd64.deb" + amd64.sha256 = "82b2e59ff7d3064a2d35614be7669bec88735f0837dac786762f7ba6a595cff3" + arm64.url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v8.0.1/onlyoffice-documentserver_arm64.deb" + arm64.sha256 = "3fe98049dc483b04f9deeaa935795c49ff6086649d7d51a4a8e67e2f1a7c6093" + rename = "onlyoffice-documentserver.deb" + autoupdate.asset.amd64 = "^onlyoffice-documentserver_amd64.deb$" + autoupdate.asset.arm64 = "^onlyoffice-documentserver_arm64.deb$" + autoupdate.strategy = "latest_github_release" [resources.database] type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 4de1a72..7a08b9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -32,15 +32,8 @@ _install_onlyoffice_deb() { # the install/configure of their package, which is awful since that will # restart NGINX and the whole webadmin and maybe even the YunoHost command # running the install... - - # Do not replace app dependencies - YNH_INSTALL_APP_DEPENDENCIES_REPLACE="false" - - # Can't do that in the manifest because we need the debconf-set-selections and postgresql already configured - ynh_exec_warn_less ynh_install_extra_app_dependencies \ - --repo="https://download.onlyoffice.com/repo/debian squeeze main" \ - --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" \ - --package="onlyoffice-documentserver" + + dpkg -i $install_dir/onlyoffice-documentserver.deb } #=================================================