From 12384b0a27c502530fda3cad04e3b3cba67a1783 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 13 Apr 2019 15:37:56 +0200 Subject: [PATCH] package check recommandations --- scripts/backup | 12 ++++++------ scripts/remove | 2 +- scripts/restore | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/backup b/scripts/backup index 9276c92..64ed7ca 100644 --- a/scripts/backup +++ b/scripts/backup @@ -7,12 +7,12 @@ #================================================= # 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 - chmod a+rx _common.sh -fi -source _common.sh +#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 +# chmod a+rx _common.sh +#fi +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index b771a21..2569dc0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,7 +16,7 @@ ynh_secure_remove /var/www/$app #removing nginx conf ynh_remove_nginx_config #removing aliases -sed -i "/devnull:\/dev\/null/d" /etc/aliases +ynh_replace_string "/devnull:\/dev\/null/d" /etc/aliases newaliases # Remove hook for postfix conf ynh_secure_remove "/usr/share/yunohost/hooks/conf_regen/98-postfix_emailpoubelle" diff --git a/scripts/restore b/scripts/restore index 22673fa..c6feefa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -7,12 +7,12 @@ #================================================= # 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 - chmod a+rx _common.sh -fi -source _common.sh +#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 +# chmod a+rx _common.sh +#fi +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #=================================================