From 1bc1d5638a0494c9e2fb0042f37b2bf87871caa0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 18 Sep 2021 15:01:21 +0200
Subject: [PATCH] Cleaning up

---
 scripts/change_url | 7 +++----
 scripts/remove     | 6 +++---
 scripts/restore    | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index c473434..6c5ec6a 100755
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -33,7 +33,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up Etherpad before changing its URL (may take a while)..." --weight=2
+ynh_script_progression --message="Backing up $app before changing its URL (may take a while)..." --weight=2
 
 # Backup the current version of Etherpad
 ynh_backup_before_upgrade
@@ -114,11 +114,10 @@ ynh_systemd_action --service_name=nginx --action=reload
 ynh_script_progression --message="Starting a systemd service..." --weight=6
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is"
-sleep 120
+ynh_systemd_action --service_name=$app --action=restart --log_path=systemd
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for Etherpad" --last
+ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/remove b/scripts/remove
index 0dd98cc..9034446 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,7 +29,7 @@ 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 >/dev/null
 then
-	ynh_script_progression --message="Removing Etherpad service integration..." --weight=2
+	ynh_script_progression --message="Removing $app service integration..." --weight=2
 	yunohost service remove $app
 fi
 
@@ -61,7 +61,7 @@ ynh_remove_nodejs
 #=================================================
 # REMOVE ETHERPAD MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing Etherpad main directory..." --weight=3
+ynh_script_progression --message="Removing $app main directory..." --weight=3
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -88,4 +88,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of Etherpad completed" --last
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index ae9902f..2c637fb 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -130,4 +130,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for Etherpad" --last
+ynh_script_progression --message="Restoration completed for $app" --last