From 89cffbd74a21ee2c6b7d10d9d48ded22b42c935e Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Tue, 12 May 2020 17:24:36 +0200
Subject: [PATCH] Fix change_url for domain change w/o path change

---
 scripts/change_url | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index b062d9b..7b2c35e 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -119,16 +119,13 @@ fi
 discourse_config_file="$final_path/config/discourse.conf"
 # Configure hostname
 ynh_replace_string --match_string="hostname = .*" --replace_string="hostname = \"$new_domain\"" --target_file="$discourse_config_file"
-ynh_replace_string --match_string="relative_url_root = .*" --replace_string="relative_url_root = ${path_url%/}" --target_file="$discourse_config_file"
+ynh_replace_string --match_string="relative_url_root = .*" --replace_string="relative_url_root = ${new_path%/}" --target_file="$discourse_config_file"
 ynh_replace_string --match_string="smtp_domain = .*" --replace_string="smtp_domain = $new_domain" --target_file="$discourse_config_file"
 
 # Calculate and store the config file checksum
 ynh_store_file_checksum --file="$discourse_config_file"
 
 # Change URL setting
-echo "UPDATE site_settings SET value = replace(value, '${old_path%/}/images/', '${new_path%/}/images/');
-UPDATE site_settings SET value = '${new_path}') WHERE name='long_polling_base_url';"
-
 ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name <<< "UPDATE site_settings SET value = replace(value, '${old_path%/}/images/', '${new_path%/}/images/');
 UPDATE site_settings SET value = '${new_path}' WHERE name='long_polling_base_url';"