From 14536887f0f65c225e694e66ebf91d3c655a3958 Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Tue, 7 Mar 2017 19:22:27 +0100
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ccc0019..5900bd0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,29 +1,32 @@
 #!/bin/bash
 
 set -e
+source .fonctions
+source /usr/share/yunohost/helpers
 
-app="jappix"
+app=$YNH_APP_INSTANCE_NAME
 
 # 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)
+domain=$(ynh_app_setting_set "$app" domain)
+path=$(ynh_app_setting_set "$app" path)
+name=$(ynh_app_setting_set "$app" name)
+language=$(ynh_app_setting_set "$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"
+path=$(ynh_normalize_url_path $path)	# Vérifie et corrige la syntaxe du 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