From c2d880694e4e32703150df34938ba3dfb1c5ad24 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Tue, 17 Jul 2018 00:02:52 +0200 Subject: [PATCH] [fix] Fix backup & restore system See https://github.com/YunoHost-Apps/dokuwiki_ynh/pull/37#pullrequestreview-134457098 and https://github.com/YunoHost/yunohost/pull/489#issuecomment-396854686 --- scripts/backup | 7 +------ scripts/restore | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/backup b/scripts/backup index 7c88c04..db64b8a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,12 +6,7 @@ # 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 +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 73ac8e3..837eaa4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -6,12 +6,7 @@ # 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 +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #=================================================