From f65ef22fc7793a747d2bf06fb5b37558e2fbb384 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Nov 2021 11:06:00 +0100 Subject: [PATCH] 1.1.17 --- check_process | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- scripts/install | 1 - scripts/upgrade | 28 ++++++++++++++-------------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/check_process b/check_process index ce959c4..0d613e1 100644 --- a/check_process +++ b/check_process @@ -20,4 +20,4 @@ ;;; Upgrade options ; commit=61398d8e49d4de8e7425c4ccd8098d5a4c55994b name=Merge pull request #77 from YunoHost-Apps/testing - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1& + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1& diff --git a/conf/app.src b/conf/app.src index 6a39146..5a26197 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://framagit.org/framasoft/framadate/framadate/-/archive/1.1.16/framadate-1.1.16.tar.gz -SOURCE_SUM=89da42a915c912a91ae1ba44fd32a61ec8fa5f59c517ee3f5d74335ddee77c7d +SOURCE_URL=https://framagit.org/framasoft/framadate/framadate/-/archive/1.1.17/framadate-1.1.17.tar.gz +SOURCE_SUM=a9b086a7274886d0d13c1c3ed8d6caa848d798315bd6006c6883a37387c390b0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=opensondage-1-1-16.tar.gz +SOURCE_FILENAME=opensondage-1-1-17.tar.gz diff --git a/manifest.json b/manifest.json index 7d07dd3..c346179 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Service pour planifier un rendez-vous ou prendre une décision rapidement et facilement", "de": "Service zur schnellen und einfachen Planung eines Termins oder zur Entscheidungsfindung" }, - "version": "1.1.16~ynh1", + "version": "1.1.17~ynh1", "url": "https://git.framasoft.org/framasoft/framadate", "upstream": { "license": "CECILL-B", diff --git a/scripts/install b/scripts/install index 8796c17..071a593 100644 --- a/scripts/install +++ b/scripts/install @@ -115,7 +115,6 @@ ynh_add_config --template="../conf/config.php" --destination="$final_path/app/in ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_app_addaccess" ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../hooks/post_app_removeaccess" - #================================================= # REPLACE LOGO IMAGE (DEFAULT IS FRAMADATE) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4f2020e..568fe74 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,6 +35,20 @@ timezone="$(cat /etc/timezone)" upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -121,20 +135,6 @@ if [ -z "$path_url" ]; then ynh_app_setting_delete --app=$app --key=path_url fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # CREATE DEDICATED USER #=================================================