From 054dc5ec5303a4acb8cdf7ab0bdd58ac4729092a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 12:08:37 +0200 Subject: [PATCH] Add ynh_add_config --- scripts/install | 11 +++-------- scripts/upgrade | 12 +++--------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/scripts/install b/scripts/install index d32dc12..939842b 100644 --- a/scripts/install +++ b/scripts/install @@ -126,14 +126,9 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -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_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" +file="__FILE__" +deskey="$(ynh_string_random --length=24)" +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index cd16af4..1adbb85 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,15 +156,9 @@ then rc_conf="$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_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" + file="__FILE__" + deskey="$(ynh_string_random --length=24)" + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER