From 4c10179be09fdf46fa1d6c1865a3a888cb1216bf Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Thu, 3 Aug 2023 21:49:50 +0200 Subject: [PATCH] Clean database related code in install script --- scripts/install | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/scripts/install b/scripts/install index c654abb..d5aa92e 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ fpm_usage="low" #================================================= ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=database --value=$database ynh_app_setting_set --app=$app --key=email --value=$email ynh_app_setting_set --app=$app --key=upload --value=$upload ynh_app_setting_set --app=$app --key=random_string --value=$random_string @@ -39,23 +38,10 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage ynh_script_progression --message="Creating a database..." --weight=2 -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -db_pwd=$(ynh_string_random --length=30) -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_app_setting_set --app=$app --key=db_user --value=$db_user -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd - -if [ $database == "mysql" ]; then - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +# ynh_mysql_setup_db --db_user=$db_user --db_name=$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;" - db_type=0 -elif [ $database == "postgresql" ]; then - ynh_psql_test_if_first_run - ynh_psql_setup_db --db_user=$db_user --db_name=$db_name - db_type=1 -fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -100,11 +86,7 @@ ynh_install_composer #================================================= ynh_script_progression --message="Provisionning database..." --weight=1 -if [ $database = "mysql" ]; then - ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql -elif [ $database = "postgresql" ]; then - ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql -fi +ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql #================================================= # ADD A CONFIGURATION