From b5c526be5c24486608d03bc11f44f142f2b82ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 17 Jul 2022 09:59:21 +0200
Subject: [PATCH] Update install

---
 scripts/install | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index dd4ac31..d4fe45b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,10 +65,11 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Creating a MySQL database..." --weight=2
 
 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
 
-ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name \
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
     <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
 
 #=================================================
@@ -175,6 +176,9 @@ exec_occ maintenance:install \
 #=================================================
 ynh_script_progression --message="Configuring Nextcloud..." --weight=8
 
+# Set the mysql.utf8mb4 config to true in config.php
+exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
+
 # Ensure that UpdateNotification app is disabled
 exec_occ app:disable updatenotification
 
@@ -291,9 +295,6 @@ exec_occ db:add-missing-indices
 exec_occ db:add-missing-columns
 exec_occ db:convert-filecache-bigint -n
 
-# Set the mysql.utf8mb4 config to true in config.php
-exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION
 #=================================================