From 01e405c770fde8000ba432919dd09e356a8e6073 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sat, 4 Mar 2017 11:07:38 +0100 Subject: [PATCH] Update upgrade --- scripts/upgrade | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3d6fdd8..d6011cb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,7 +10,7 @@ app=$YNH_APP_INSTANCE_NAME source /usr/share/yunohost/helpers domain=$(ynh_app_setting_get $app domain) -path=$(ynh_app_setting_get $app path) +path_url=$(ynh_app_setting_get $app path_url) final_path=$(ynh_app_setting_get $app final_path) admin_name=$(ynh_app_setting_get $app admin_name) admin_pass=$(ynh_app_setting_get $app admin_pass) @@ -21,9 +21,8 @@ db_user=$(ynh_app_setting_get $app db_user) CHECK_PATH # Vérifie et corrige la syntaxe du path. # Remove trailing "/" for next commands -if [[ ! "$path" == "/" ]]; then - path=${path%/} -fi + +path_url=$(ynh_normalize_url_path $path_url) # Vérifie et corrige la syntaxe du path. # We download the sources and check the md5sum SFILE=`sudo cat ../sources/source_file`; @@ -41,10 +40,10 @@ sudo rm -rf $final_path/public_html sudo chown www-data:www-data $final_path -R # set database configuration -sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf +sed -i "s@YNH_WWW_PATH@$path_url@g" ../conf/nginx.conf # Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf +sed -i "s@YNH_WWW_PATH@$path_url@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf sudo sed -i "s@NAMETOCHANGE@$app@g" ../conf/nginx.conf nginxconf=/etc/nginx/conf.d/$domain.d/$app.conf