From d28b5a97fe4d314f0dfc180cae10ed6113d4b1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 31 Mar 2021 13:13:00 +0200
Subject: [PATCH] 2.0.14 (#24) (#25)

* 2.0.14
---
 README.md       |  2 +-
 conf/app.src    |  4 ++--
 manifest.json   |  2 +-
 scripts/install | 16 ++++------------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 39065bf..8f823a7 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full
 
 **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
 
-**Shipped version:** 2.0.13
+**Shipped version:** 2.0.14
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index cac0981..bc7b211 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.0.13/webtrees-2.0.13.zip
-SOURCE_SUM=badff15ca4432d339728282207ebc1bd3d51b8fdf46e23631ce6598d14a3af5a
+SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.0.14/webtrees-2.0.14.zip
+SOURCE_SUM=1d40b2a33904fc74a47a504e492b9949f2380efe077f409002597682cbbede61
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index ae2da89..9aabc9e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based genealogy application",
         "fr": "Logiciel libre de généalogie en ligne"
     },
-    "version":"2.0.13~ynh2",
+    "version":"2.0.14~ynh1",
     "url": "https://www.webtrees.net",
     "license": "GPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index fb60486..4b4954c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -64,6 +64,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Creating a MySQL database..."
 
 db_name=$(ynh_sanitize_dbid --db_name=$app)
+db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name
 
@@ -106,12 +107,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 
 # Adding the details of the database to the config file
-ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="../conf/config.ini.php"
-ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd"  --target_file="../conf/config.ini.php"
-ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="../conf/config.ini.php"
+ynh_add_config --template="../conf/config.ini.php" --destination="$final_path/data/config.ini.php"
 
-# Copy the config file to the final path
-cp ../conf/config.ini.php $final_path/data/.
+# # Copy the config file to the final path
+# cp ../conf/config.ini.php $final_path/data/.
 
 # Load initial SQL into the new database
 ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql"
@@ -124,13 +123,6 @@ ynh_replace_string --match_string="__PASSWORD__"   --replace_string="$admin_pass
 
 ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql"
 
-#=================================================
-# STORE THE CONFIG FILE CHECKSUM
-#=================================================
-
-# Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$final_path/data/config.ini.php"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================