From 7233b3e8818de2b62f98b88f3e9aa2ca677f5f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 16 Oct 2023 16:59:06 +0200 Subject: [PATCH] Remove line_match from ynh_systemd_actions : they actually just match when systemctl returns --- scripts/change_url | 4 ++-- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 6ed75c4..38754c3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --timeout=15 #================================================= # MODIFY URL IN NGINX CONF @@ -49,7 +49,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --timeout=15 #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 7129efe..d0c1c48 100644 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ sleep 30 ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" --timeout=15 ynh_add_config --template="system.xml" --destination="$config_path/system.xml" ynh_add_config --template="network.xml" --destination="$config_path/network.xml" @@ -117,7 +117,7 @@ ynh_permission_update --permission="admin" --add="$admin" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --timeout=15 #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index c0860b5..45c8098 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,7 +100,7 @@ yunohost service add $app --description="Jellyfin media center" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --timeout=15 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 30965d4..276d8c3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" --timeout=15 #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -157,7 +157,7 @@ yunohost service add $app --description="Jellyfin media center" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --timeout=15 #================================================= # END OF SCRIPT