From 12d882fe752dbd315890f6753d7f4ce164a48d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 17 Nov 2020 23:51:51 +0100 Subject: [PATCH] Fix package linter --- scripts/backup | 8 ++++---- scripts/change_url | 8 ++++---- scripts/install | 8 ++++---- scripts/remove | 6 +++--- scripts/restore | 8 ++++---- scripts/upgrade | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/backup b/scripts/backup index 9825ae9..2565a45 100644 --- a/scripts/backup +++ b/scripts/backup @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - # LOAD SETTINGS ynh_script_progression --message="Loading installation settings..." final_path=$(ynh_app_setting_get --app $app --key final_path) diff --git a/scripts/change_url b/scripts/change_url index ce0313d..424c73c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - # Retrive arguments ynh_script_progression --message="Loading installation settings..." old_domain=$YNH_APP_OLD_DOMAIN diff --git a/scripts/install b/scripts/install index b775c7f..2dd26a6 100644 --- a/scripts/install +++ b/scripts/install @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - ynh_script_progression --message="Validating installation parameters..." # RETRIEVE ARGUMENTS FROM THE MANIFEST diff --git a/scripts/remove b/scripts/remove index 89e7115..17b0d03 100644 --- a/scripts/remove +++ b/scripts/remove @@ -4,9 +4,6 @@ # GENERIC START #================================================= -# Source YunoHost helpers -source /usr/share/yunohost/helpers - # Stop script if errors set -u @@ -14,6 +11,9 @@ set -u source ./experimental_helper.sh source ./_common.sh +# Source YunoHost helpers +source /usr/share/yunohost/helpers + # LOAD SETTINGS ynh_script_progression --message="Loading installation settings..." domain=$(ynh_app_setting_get --app $app --key domain) diff --git a/scripts/restore b/scripts/restore index c73b798..b3db386 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - # LOAD SETTINGS ynh_script_progression --message="Loading settings..." domain=$(ynh_app_setting_get --app $app --key domain) diff --git a/scripts/upgrade b/scripts/upgrade index 110f580..b1fae6e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - # LOAD SETTINGS ynh_script_progression --message="Loading installation settings..." domain=$(ynh_app_setting_get --app $app --key domain)