diff --git a/scripts/restore b/scripts/restore index b2fa666..de26485 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -26,15 +25,13 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Restoring the MySQL database..." -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) if [ $database == "mysql" ]; then - 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 elif [ $database == "postgresql" ]; then - ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql fi