From d8f670f7cecb97d700e96510fb1dc4cafb997bd7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 14 Jul 2020 13:58:15 +0200 Subject: [PATCH] cleaning up --- pull_request_template.md | 1 - scripts/install | 2 +- scripts/upgrade | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 23b89b0..2db70f4 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -16,4 +16,3 @@ *If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/garradin_ynh%20PR-NUM-%20(USERNAME)/) - diff --git a/scripts/install b/scripts/install index f080a8e..9169c22 100644 --- a/scripts/install +++ b/scripts/install @@ -139,4 +139,4 @@ systemctl reload nginx # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last \ No newline at end of file +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/upgrade b/scripts/upgrade index b5f5e7f..22afa25 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) || ynh_die "This path already contains a folder" + #================================================= # CHECK VERSION #================================================= @@ -61,7 +62,7 @@ fi #================================================= # Backup Data #================================================= -ynh_script_progression --message="Backing up the data before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the data before upgrading (may take a while)..." --weight=1 bdd=$final_path/association.sqlite squelettes=$final_path/www/squelettes @@ -77,7 +78,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -134,7 +135,7 @@ ynh_add_fpm_config # Change options in file config.dist.php # and copy in local.dist.php #================================================= -ynh_script_progression --message="final configuration needed..." --time --weight=1 +ynh_script_progression --message="final configuration needed..." --weight=1 key=$(ynh_string_random --length=50) cp -a $final_path/config.dist.php $final_path/config.local.php