From 8e126ea0fa94ed77ec1f504baeca8e56e5941a94 Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Wed, 8 Mar 2017 23:34:00 +0100
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 245ffe8..4e4e187 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,47 +1,44 @@
 #!/bin/bash
 
-set -e
+set -eu
+source .fonctions
+source /usr/share/yunohost/helpers
 
-source ./_common.sh
+app=$YNH_APP_INSTANCE_NAME
 
-app="jappix"
-
-# Retrieve arguments
-domain=$(sudo yunohost app setting "$app" domain)
-path=$(sudo yunohost app setting "$app" path)
-name=$(sudo yunohost app setting "$app" name)
-language=$(sudo yunohost app setting "$app" language)
+# Récupère les infos de l'application.
+domain=$(ynh_app_setting_get $app domain)
+path=$(ynh_app_setting_get $app path)
+name=$(ynh_app_setting_get "$app" name)
+language=$(ynh_app_setting_get "$app" language)
 
 # Set default values
 name="${name:-YunoJappix}"
 language="${language:-en}"
 
 # Remove trailing "/" for next commands
-path=${path%/}
-
-# Retrieve sources
-wget -q -O jappix.tar.gz "$JAPPIX_SOURCE_URL"
+CHECK_PATH
 
+#=================================================
 # Copy files to the right place
+#=================================================
+
 final_path="/var/www/${app}"
+ynh_app_setting_set $app final_path $final_path
+SETUP_SOURCE	# Télécharge la source, décompresse et copie dans $final_path
 sudo mkdir -p "${final_path}/store/conf"
-sudo tar -C "$final_path" -xf jappix.tar.gz --strip-components 1
 sudo cp ../conf/*.xml "${final_path}/store/conf/"
 
 # Set permissions to jappix directory
 sudo chown -R www-data: "$final_path"
 
 # Set and copy NGINX configuraion
-sudo sed -i "s@PATHTOCHANGE2@${path}@g" ../conf/nginx.conf
-path=${path:-/}
 sudo sed -i "s@PATHTOCHANGE@${path}@g" ../conf/nginx.conf
 sudo sed -i "s@ALIASTOCHANGE@${final_path}/@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 
 # Set Jappix configuration
-sudo sed -i "s@PATHTOCHANGE@${path}@g" "${final_path}/store/conf/main.xml"
 sudo sed -i "s@PATHTOCHANGE@${path}@g" "${final_path}/store/conf/hosts.xml"
-sudo sed -i "s@DOMAINTOCHANGE@${domain}@g" "${final_path}/store/conf/main.xml"
 sudo sed -i "s@CHANGELANG@${language}@g" "${final_path}/store/conf/main.xml"
 sudo sed -i "s@CHANGENAME@${name}@g" "${final_path}/store/conf/main.xml"
 sudo sed -i "s@DOMAINTOCHANGE@${domain}@g" "${final_path}/store/conf/hosts.xml"