From f91ad3ecbe131c8cc994743691c8f1358d94a12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 12:35:09 +0100
Subject: [PATCH] Fix

---
 scripts/backup  | 1 +
 scripts/install | 3 ++-
 scripts/remove  | 3 +++
 scripts/restore | 7 +++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index a9a1629..2d2ea7a 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -16,6 +16,7 @@ ynh_print_info --message="Loading installation settings..."
 
 with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql)
 with_sftp=$(ynh_app_setting_get --app=$app --key=with_sftp)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
diff --git a/scripts/install b/scripts/install
index 4cd4cef..21a069c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -59,8 +59,9 @@ then
     ynh_install_app_dependencies "php${phpversion}-mysql"
 
     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
+    ynh_mysql_setup_db --db_user=$ db_user --db_name=$db_name
 fi
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index ba62ebb..b42dc60 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -26,6 +26,9 @@ with_sftp=$(ynh_app_setting_get --app=$app --key=with_sftp)
 if [ $with_mysql -eq 1 ]; then
     ynh_script_progression --message="Removing the MySQL database..." --weight=2
 
+    db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+    db_user=$db_name
+
     # Remove a database if it exists, along with the associated user
     ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 fi
diff --git a/scripts/restore b/scripts/restore
index 266850a..5a11cce 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -46,9 +46,12 @@ if [ $with_mysql -eq 1 ]; then
 
     ynh_install_app_dependencies "php${phpversion}-mysql"
 
+
+    db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+    db_user=$db_name
     db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-    ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
-    ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql
+    ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+    ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 fi
 
 #=================================================