diff --git a/manifest.json b/manifest.json index cd44234..9ab505f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.19~ynh1", + "version": "2.19~ynh2", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "maintainer": { diff --git a/scripts/change_url b/scripts/change_url index c81dd88..cd8e436 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -120,8 +120,8 @@ php_config=$final_path/inc/config.php ynh_backup_if_checksum_is_different --file="$php_config" -new_admin_url="${new_path%/}/admin/index.php" -old_admin_url="${old_path%/}/admin/index.php" +new_admin_url="${new_path%/}/admin/" +old_admin_url="${old_path%/}/admin/" ynh_replace_string --match_string="'DC_ADMIN_URL', 'https://$old_domain$old_admin_url'" --replace_string="'DC_ADMIN_URL', 'https://$new_domain$new_admin_url'" --target_file=$php_config ynh_store_file_checksum --file="$php_config" diff --git a/scripts/install b/scripts/install index a143271..6b38ff1 100755 --- a/scripts/install +++ b/scripts/install @@ -115,7 +115,7 @@ ynh_app_setting_set --app=$app --key=master_key --value=$master_key cp $php_config.in $php_config -admin_url="${path_url%/}/admin/index.php" +admin_url="${path_url%/}/admin/" email=$(ynh_user_get_info --username=$admin --key=mail) diff --git a/scripts/upgrade b/scripts/upgrade index 6bb1db5..fc37c0f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,7 +147,7 @@ ynh_backup_if_checksum_is_different --file=$php_config cp $php_config.in $php_config -admin_url="${path_url%/}/admin/index.php" +admin_url="${path_url%/}/admin/" email=$(ynh_user_get_info --username=$admin --key=mail)