From 099ab2a78596fe2b967ff490bc7943592c2713c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 19 May 2018 20:42:24 +0200
Subject: [PATCH] Improve change_url

---
 manifest.json      |  2 +-
 scripts/change_url | 43 +++++++++----------------------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/manifest.json b/manifest.json
index 26095cb..9cef0b8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -24,7 +24,7 @@
         "mysql"
     ],
     "requirements": {
-        "yunohost": ">= 2.4.0"
+        "yunohost": ">= 2.7.12"
     },
     "arguments": {
         "install" : [
diff --git a/scripts/change_url b/scripts/change_url
index 46ad532..c85fa31 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -14,57 +14,32 @@ ynh_abort_if_errors
 source ./experimental_helper.sh
 source ./_common.sh
 
-cp -r  /etc/yunohost/apps/${app}/conf ../ # Quick hack for https://github.com/YunoHost/yunohost/pull/427
-
 # RETRIEVE ARGUMENTS
 old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
+domain=$YNH_APP_NEW_DOMAIN
+path_url=$(ynh_normalize_url_path ${YNH_APP_NEW_PATH:-'/'})
 app=$YNH_APP_INSTANCE_NAME
 
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 admin=$(ynh_app_setting_get "$app" adminusername)
 key=$(ynh_app_setting_get "$app" secret_key)
 port=$(ynh_app_setting_get "$app" web_port)
-
-# CHECK THE SYNTAX OF THE PATHS
-test -n "$old_path" || old_path="/"
-test -n "$new_path" || new_path="/"
-new_path=$(ynh_normalize_url_path $new_path)
-old_path=$(ynh_normalize_url_path $old_path)
-
-domain="$new_domain"
-path_url="$new_path"
-
-# CHECK WHICH PARTS SHOULD BE CHANGED
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-    change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-    change_path=1
-fi
+is_public=$(ynh_app_setting_get "$app" is_public)
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
 
-# MODIFY URL IN NGINX CONF
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
-
 # Change the domain for nginx
-if [ $change_domain -eq 1 ]
+if [ "$old_domain" != "$domain" ]
 then
     # Delete file checksum for the old conf file location
-    ynh_delete_file_checksum "$nginx_conf_path"
-    mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
+    ynh_delete_file_checksum "/etc/nginx/conf.d/$old_domain.d/$app.conf"
+
+    mv "/etc/nginx/conf.d/$old_domain.d/$app.conf" "/etc/nginx/conf.d/$domain.d/$app.conf"
+
     # Store file checksum for the new config file location
-    ynh_store_file_checksum "/etc/nginx/conf.d/$new_domain.d/$app.conf"
+    ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 fi
 
 config_nginx