From d7e057a6c61d3410f32d787a744edbd22ea4a8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 22 May 2024 14:57:25 +0200 Subject: [PATCH] upgrade --- manifest.toml | 6 +++--- scripts/restore | 7 ------- scripts/upgrade | 16 +++------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/manifest.toml b/manifest.toml index aa0c908..5fa92b5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Element" description.en = "Web client for Matrix" description.fr = "Client web pour Matrix" -version = "1.11.66~ynh1" +version = "1.11.67~ynh1" maintainers = ["Josué Tille"] @@ -56,8 +56,8 @@ ram.runtime = "0M" [resources.sources] [resources.sources.main] - url = "https://github.com/element-hq/element-web/releases/download/v1.11.66/element-v1.11.66.tar.gz" - sha256 = "4bab7bf011f650a94f2bc0a6e8f0f0cb7fe59975f3cced1cb270c47419169c37" + url = "https://github.com/element-hq/element-web/releases/download/v1.11.67/element-v1.11.67.tar.gz" + sha256 = "fb0eaf04eb26175db39f9436b772e01e1e5e2095e403dc0df0385e5256bf01e5" autoupdate.strategy = "latest_github_release" autoupdate.asset = "^element-v.*.tar.gz$" diff --git a/scripts/restore b/scripts/restore index 299eaca..470dc24 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,13 +26,6 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE -#================================================= -ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 34e4e13..bf9e67d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -68,14 +62,10 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.json" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.json" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"