diff --git a/scripts/backup b/scripts/backup index 659546a..c4933b1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -8,8 +8,8 @@ #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source /usr/share/yunohost/helpers source ../settings/scripts/ynh_systemd_action +source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE diff --git a/scripts/install b/scripts/install index a78c1fa..d68e239 100644 --- a/scripts/install +++ b/scripts/install @@ -7,9 +7,9 @@ #================================================= source _common.sh -source /usr/share/yunohost/helpers source ynh_add_secure_repos__3 source ynh_systemd_action +source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE diff --git a/scripts/restore b/scripts/restore index 1e322be..84e73bd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,15 +6,10 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh -fi - -source _common.sh +source ../settings/scripts/_common.sh +source ../settings/scripts/ynh_add_secure_repos__3 +source ../settings/scripts/ynh_systemd_action source /usr/share/yunohost/helpers -source ynh_add_secure_repos__3 -source ynh_systemd_action #================================================= # MANAGE SCRIPT FAILURE diff --git a/scripts/upgrade b/scripts/upgrade index 304fdc5..e3d76da 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,9 +7,9 @@ #================================================= source _common.sh -source /usr/share/yunohost/helpers source ynh_add_secure_repos__3 source ynh_systemd_action +source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS