From 553ed4e02f7978c85eb55b8ffa8c906bbd98d0f3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 09:05:56 +0100 Subject: [PATCH] Fix --- scripts/install | 11 +++++++++-- scripts/upgrade | 13 +++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index b5d3dfe..5ee7aef 100644 --- a/scripts/install +++ b/scripts/install @@ -122,8 +122,15 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -deskey=$(ynh_string_random --length=24) -ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" +rc_conf="$final_path/config/config.inc.php" + +cp ../conf/config.inc.php "$rc_conf" + +ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index dfa5ae1..550080a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,8 +144,17 @@ then ynh_script_progression --message="Reconfiguring Roundcube..." rc_conf="$final_path/config/config.inc.php" - deskey=$(ynh_string_random --length=24) - ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" + + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$rc_conf" + + cp ../conf/config.inc.php "$rc_conf" + + ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_name --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER