From 02346776f2dcaa8fc5cd78277b6730176b1bb949 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sat, 12 Mar 2016 00:15:15 +0100 Subject: [PATCH] [fix] follow up directory move /usr/share/yunohost/helpers --- data/helpers | 2 +- data/hooks/backup/17-data_home | 2 +- data/hooks/backup/23-data_mail | 2 +- data/hooks/conf_regen/43-dnsmasq | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/helpers b/data/helpers index 7473c96c..a56a6a57 100644 --- a/data/helpers +++ b/data/helpers @@ -1,7 +1,7 @@ # -*- shell-script -*- # TODO : use --regex to validate against a namespace -for helper in $(run-parts --list /usr/share/yunohost/apps/helpers.d 2>/dev/null) ; do +for helper in $(run-parts --list /usr/share/yunohost/helpers.d 2>/dev/null) ; do [ -r $helper ] && . $helper || true done diff --git a/data/hooks/backup/17-data_home b/data/hooks/backup/17-data_home index d6faa893..f7987843 100644 --- a/data/hooks/backup/17-data_home +++ b/data/hooks/backup/17-data_home @@ -1,7 +1,7 @@ backup_dir="$1/data/home" sudo mkdir -p $backup_dir -. /usr/share/yunohost/apps/helpers +. /usr/share/yunohost/helpers for f in $(find /home/* -type d -prune | awk -F/ '{print $NF}'); do if [[ ! "$f" =~ ^yunohost|lost\+found ]]; then diff --git a/data/hooks/backup/23-data_mail b/data/hooks/backup/23-data_mail index 66067fcf..f49fa038 100644 --- a/data/hooks/backup/23-data_mail +++ b/data/hooks/backup/23-data_mail @@ -1,5 +1,5 @@ backup_dir="$1/data/mail" -. /usr/share/yunohost/apps/helpers +. /usr/share/yunohost/helpers ynh_bind_or_cp /var/mail $backup_dir 1 diff --git a/data/hooks/conf_regen/43-dnsmasq b/data/hooks/conf_regen/43-dnsmasq index 31c75d77..cfd9215e 100644 --- a/data/hooks/conf_regen/43-dnsmasq +++ b/data/hooks/conf_regen/43-dnsmasq @@ -3,7 +3,7 @@ set -e force=$1 -. /usr/share/yunohost/apps/helpers +. /usr/share/yunohost/helpers function safe_copy () { if [[ "$force" == "True" ]]; then