From c36216d4ca30fa90c5d01d7341bfa7a19be61e95 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sat, 7 Mar 2015 14:08:41 +0000
Subject: [PATCH] Update of remove and upgrade scripts

---
 scripts/remove  |  2 +-
 scripts/upgrade | 35 +++++++++++------------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 0497cfa..3941eb8 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,7 +7,7 @@ db_name=$app
 root_pwd=$(sudo cat /etc/yunohost/mysql)
 domain=$(sudo yunohost app setting $app domain)
 
-# Remember to keep $root_pwd without a gap to -p otherwise it doesn't work
+# Remember to keep $root_pwd without a gap with -p otherwise it doesn't work
 mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
 sudo rm -rf /var/www/$app
 sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
diff --git a/scripts/upgrade b/scripts/upgrade
index 2684bb2..05e2b49 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,37 +5,24 @@ app=phpBB
 # Retrieve arguments
 domain=$(sudo yunohost app setting $app domain)
 path=$(sudo yunohost app setting $app path)
+final_path=/var/www/$app
 is_public=$(sudo yunohost app setting $app is_public)
+#db_pwd=$(sudo yunohost app setting $app mysqlpwd)
+#db_user=$app
 
-
-# Check domain/path availability
-#sudo yunohost app checkurl $domain$path -a rainloop
-#if [[ ! $? -eq 0 ]]; then
-#    exit 1
-#fi
-
-# Generate random DES key & password
-#deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-#db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-
-# Use 'rainloop' as database name and user
-#db_user=rainloop
+# Cleaning before reinstallation
+#mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
+sudo rm -rf $final_path
+sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
+sudo rm -f /etc/php5/fpm/pool.d/$app.conf
 
 # Initialize database and store mysql password for upgrade
-#sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/SQL/mysql.initial.sql)
-#sudo yunohost app setting rainloop mysqlpwd -v $db_pwd
+#sudo yunohost app initdb $db_user -p $db_pwd
 
-#mysql -u $db_user -p$db_pwd $db_user < ../sources/plugins/automatic_addressbook/SQL/mysql.initial.sql
-
-# Copy files to the right place
-final_path=/var/www/$app
-sudo rm -rf $final_path/*
-#sudo mkdir -p $final_path
+sudo mkdir -p $final_path
 sudo cp -a ../sources/$app/* $final_path
 
-
-# Set permissions to rainloop directory
-# sudo mkdir -p $final_path/logs
+# Set permissions to $final_path directory
 sudo chown -R www-data:www-data $final_path
 
 # Modify Nginx configuration file and copy it to Nginx conf directory