From c75e25434ac94abc2f3652e1bbcc636540b8b7d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sat, 30 Apr 2016 23:50:23 +0200
Subject: [PATCH] [fix] Remove old parts from backup/restore and use relative
 path

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

diff --git a/scripts/backup b/scripts/backup
index a87d461..f576013 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -11,18 +11,17 @@ app=${!#}
 backup_dir=$1
 
 # Backup sources & data
-sudo cp -a /var/www/$app/. $backup_dir/sources
+sudo cp -a "/var/www/${app}" ./sources
 
 # Backup mysql database if needed
 # db_pwd=$(sudo yunohost app setting $app mysqlpwd)
-# sudo mysqldump -u $app -p$db_pwd $app > $backup_dir/$app.dmp
+# sudo mysqldump -u $app -p$db_pwd $app > ./dump.sql
 
-# Copy Nginx and YunoHost parameters to make the script "standalone"
-sudo cp -a /etc/yunohost/apps/$app/. $backup_dir/yunohost
-domain=$(sudo yunohost app setting $app domain)
-sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf
+# Copy NGINX configuration
+domain=$(sudo yunohost app setting "$app" domain)
+sudo cp -a "/etc/nginx/conf.d/${domain}.d/${app}.conf" ./nginx.conf
 
 # If a dedicated php-fpm process is used :
 # Copy dedicated php-fpm process to backup folder
 #
-#sudo cp -a /etc/php5/fpm/pool.d/$app.conf $backup_dir/php-fpm.conf
+#sudo cp -a "/etc/php5/fpm/pool.d/${app}.conf" ./php-fpm.conf
diff --git a/scripts/restore b/scripts/restore
index dcea94c..62b3a3e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -11,27 +11,26 @@ app=${!#}
 backup_dir=$1
 
 # Restore sources & data
-final_path=/var/www/$app
-sudo cp -a $backup_dir/sources/. $final_path
+final_path="/var/www/${app}"
+sudo cp -a ./sources "$final_path"
 
 # Restore permissions to app files
 # you may need to make some file and/or directory writeable by www-data (nginx user)
-sudo chown -R root:root $final_path
+sudo chown -R root:root "$final_path"
 
 # Restore mysql database if needed
 # db_pwd=$(sudo yunohost app setting $app mysqlpwd)
-# sudo mysql -u $app -p$db_pwd $app < $backup_dir/$app.dmp
+# sudo mysql -u $app -p$db_pwd $app < ./dump.sql
 
-# Restore Nginx and YunoHost parameters
-sudo cp -a $backup_dir/yunohost/. /etc/yunohost/apps/$app
-domain=$(sudo yunohost app setting $app domain)
-sudo cp -a $backup_dir/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
+# Restore NGINX configuration
+domain=$(sudo yunohost app setting "$app" domain)
+sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 
 # If a dedicated php-fpm process is used :
 # Copy dedicated php-fpm process from backup folder to the right location
 # And restart service
 #
-#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"
 #sudo service php5-fpm reload
 
 # Restart webserver