From aa8928abd9d670920a23e922ab6d188ba530ffb1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 17 Feb 2021 19:22:07 +0100
Subject: Apply last example_ynh

---
 scripts/remove | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/remove')

diff --git a/scripts/remove b/scripts/remove
index 9fac8f2..46a78ab 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,7 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$app
+db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
@@ -32,19 +32,19 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 # Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status "$app-web" >/dev/null
 then
-	ynh_script_progression --message="Removing $app-web service..."
+	ynh_script_progression --message="Removing $app-web service integration..."
 	yunohost service remove "$app-web"
 fi
 
 if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null
 then
-	ynh_script_progression --message="Removing $app-sidekiq service..."
+	ynh_script_progression --message="Removing $app-sidekiq service integration..."
 	yunohost service remove "$app-sidekiq"
 fi
 
 if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null
 then
-	ynh_script_progression --message="Removing $app-streaming service..."
+	ynh_script_progression --message="Removing $app-streaming service integration..."
 	yunohost service remove "$app-streaming"
 fi
 
-- 
cgit v1.2.3-70-g09d2


From 88969d7b7ad4e3581599f748ea3b61dfc51c19a5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 23 Feb 2021 04:14:27 +0100
Subject: Fix bad database user name

---
 scripts/remove  | 2 +-
 scripts/restore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/remove')

diff --git a/scripts/remove b/scripts/remove
index 46a78ab..0c71d04 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,7 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user=$app
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 11729d4..e51126f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -33,7 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user=$app
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 
 #=================================================
-- 
cgit v1.2.3-70-g09d2