From df6065f4b8248c7cce31e70d4d93f2190a562c7f Mon Sep 17 00:00:00 2001
From: root <root@7dd18f2b56a5>
Date: Fri, 17 Feb 2017 20:37:28 +0000
Subject: [PATCH] Use of backup helpers

---
 scripts/backup  | 14 +++++++-------
 scripts/restore | 14 ++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 33598f1..f7c35f8 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -12,19 +12,19 @@ db_user=$(ynh_app_setting_get $app db_user)
 
 # The parameter $1 is the backup directory location
 # which will be compressed afterward
-backup_dir=$1/apps/$app
-sudo mkdir -p "$backup_dir"
 
 # Backup sources & data
-sudo cp -a $final_path/. $backup_dir/sources
+ynh_backup "$final_path" "sources"
 
 # Copy Nginx and YunoHost parameters to make the script "standalone"
-sudo cp -a /etc/yunohost/apps/$app/. $backup_dir/yunohost
-sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" "nginx.conf"
+
+ynh_backup "/etc/yunohost/apps/$app/" "yunohost"
 
 # Copy dedicated php-fpm process to backup folder
-sudo cp -a /etc/php5/fpm/pool.d/$app.conf $backup_dir/php-fpm.conf
+ynh_backup "/etc/php5/fpm/pool.d/$app.conf" "php-fpm.conf"
 
 # Backup db
 root_pwd=$(sudo cat /etc/yunohost/mysql)
-sudo mysqldump -u root -p$root_pwd --no-create-db $db_user --result-file="$backup_dir/db.sql"
+sudo mysqldump -u root -p$root_pwd --no-create-db $db_user --result-file="db.sql"
+ynh_backup "db.sql" "backupdb.sql"
diff --git a/scripts/restore b/scripts/restore
index 86dfb99..fdbe91d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -18,28 +18,26 @@ if [ -d $final_path ]; then
     exit 1
 fi
 
-# The parameter $1 is the uncompressed restore directory location
-backup_dir=$1/apps/$app
-
 # Restore Nginx
 conf=/etc/nginx/conf.d/$domain.d/$app.conf
 if [ -f $conf ]; then
     echo "There is already a nginx conf file at this path: $conf " >&2
     exit 1
 fi
-sudo cp -a $backup_dir/nginx.conf $conf
+sudo cp -a ./nginx.conf $conf
 
 # Restore YunoHost parameters
-sudo cp -a $backup_dir/yunohost/. /etc/yunohost/apps/$app
+sudo cp -a ./yunohost/. /etc/yunohost/apps/$app/
 
 # Restore sources & data
-sudo cp -a "$backup_dir/sources/." $final_path
+sudo mkdir -p $final_path
+sudo cp -a ./sources/* $final_path/
 
 ynh_mysql_create_db $db_user $db_user $db_pwd
-mysql --debug-check -u $db_user -p$db_pwd $db_user < ${backup_dir}/db.sql
+mysql --debug-check -u $db_user -p$db_pwd $db_user < ./backupdb.sql
 
 # Copy dedicated php-fpm process from backup folder to the right location
-sudo cp -a $backup_dir/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf
+sudo cp -a ./php-fpm.conf /etc/php5/fpm/pool.d/$app.conf
 
 # We grant access to admin only
 sudo yunohost app addaccess --users=$admin $app