From e93f8556ae91973dc222fa2ab6d268b1043ea11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 14 Feb 2019 09:52:14 +0100
Subject: [PATCH] Simplify change-url script

---
 scripts/change_url | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 8cda492..3a8de48 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -18,9 +18,8 @@ cp -r  /etc/yunohost/apps/${app}/conf ../ # Quick hack for https://github.com/Yu
 
 # 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)
@@ -28,28 +27,6 @@ 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
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -58,13 +35,13 @@ fi
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
 # Change the domain for nginx
-if [ $change_domain -eq 1 ]
-then
+# Change the domain for nginx
+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
+    mv $nginx_conf_path /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
@@ -74,4 +51,4 @@ config_gitea
 
 # RELOAD services
 ynh_check_starting "INFO] Listen: http://0.0.0.0:" "/var/log/$app/gitea.log"
-sleep 1
\ No newline at end of file
+sleep 1