From a0be2c0c0a1a801a1f02642e331d50ef90c4c73f Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:06:51 +0100 Subject: [PATCH 1/4] Fix upgrade warnings --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f37b7b1..44fe77f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,9 +65,9 @@ then pushd $install_dir chown -R $app:www-data "$install_dir" - ynh_exec_as $app git fetch + ynh_exec_warn_less ynh_exec_as $app git fetch #git checkout master - ynh_exec_as $app git pull + ynh_exec_warn_less ynh_exec_as $app git pull popd fi From d308f121c50c400282cb55d1779795eb4c68ec60 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:24:31 +0100 Subject: [PATCH 2/4] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 44fe77f..e61f7fd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,7 +136,7 @@ yunohost service add $app --description="A interplanetary blogging platform" --l #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" #================================================= From 9a98e27e104e80a20206db3a0dbdac2744f1a9e8 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:37:15 +0100 Subject: [PATCH 3/4] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e61f7fd..a87c435 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,7 +136,7 @@ yunohost service add $app --description="A interplanetary blogging platform" --l #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Started" +ynh_systemd_action --service_name=$app --action="start" --log_path=systemd #================================================= From aee86ede8012fa457637ef05c32c75e8fad0d2ba Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:00:57 +0100 Subject: [PATCH 4/4] Fix upgrade --- scripts/upgrade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index a87c435..e07be0c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,7 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Stopping a systemd service..." --weight=1 # Stop service before backup, to not loose message in case of failed upgrade and restore -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP @@ -138,7 +138,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd - #================================================= # END OF SCRIPT #=================================================