Merge pull request #49 from Gofannon/fix-restore-_common.sh

[fix] Fix backup & restore system
6 years ago · 50dc2aa5fa
parent d3f4117369 c2d880694e
commit 50dc2aa5fa
2 changed files with 2 additions and 12 deletions
--- 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

 #=================================================
--- 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

 #=================================================