diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index 3d7f008..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES AND CUSTOM HELPERS -#================================================= diff --git a/scripts/backup b/scripts/backup index f7f621f..888ca3b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -4,8 +4,8 @@ # IMPORT GENERIC HELPERS #================================================= -# 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 ynh_print_info "Declaring files to be backed up..." diff --git a/scripts/change_url b/scripts/change_url index ab0fb0e..2b762b1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,7 +4,7 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh + source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 97083b8..192d741 100755 --- a/scripts/install +++ b/scripts/install @@ -4,7 +4,7 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh + source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index ced19ce..53302fb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,7 +4,7 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh + source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index e597a9d..6703b71 100755 --- a/scripts/restore +++ b/scripts/restore @@ -4,8 +4,8 @@ # IMPORT GENERIC HELPERS #================================================= -# 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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3a7f3bf..6782c35 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -4,7 +4,7 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh + source /usr/share/yunohost/helpers #=================================================