From 5b58e572d1b638ac64443d60f9a167d50347f1a1 Mon Sep 17 00:00:00 2001
From: Kayou <pierre@kayou.io>
Date: Fri, 2 Aug 2024 18:55:40 +0200
Subject: [PATCH] final_path -> install_dir

---
 scripts/change_url | 4 ++--
 scripts/install    | 4 ++--
 scripts/restore    | 2 +-
 scripts/upgrade    | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index ab229fc..34b9f54 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -79,10 +79,10 @@ then
 
     ynh_systemd_action --service_name="${app}-notify-push" --action=restart
 
-    exec_occ config:app:set notify_push base_endpoint --value https://$domain$path_url/push
+    exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
     if ! exec_occ notify_push:self-test; then
-        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
+        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${phpversion} $install_dir/occ notify_push:self-test\" to verify that everything is green."
     fi
 fi
 
diff --git a/scripts/install b/scripts/install
index 4851013..eecbb50 100755
--- a/scripts/install
+++ b/scripts/install
@@ -243,7 +243,7 @@ ynh_multimedia_addaccess $app
 if [ $enable_notify_push -eq 1 ]
 then
     exec_occ app:install notify_push
-    exec_occ config:app:set notify_push base_endpoint --value https://$domain$path_url/push
+    exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
     mkdir -p /var/run/$app/
     chown $app: /var/run/$app/
@@ -302,7 +302,7 @@ then
     ynh_systemd_action --service_name="${app}-notify-push" --action=restart
 
     if ! exec_occ notify_push:self-test; then
-        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
+        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${phpversion} $install_dir/occ notify_push:self-test\" to verify that everything is green."
     fi
 fi
 
diff --git a/scripts/restore b/scripts/restore
index d747c18..a7c73dd 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -165,7 +165,7 @@ then
     ynh_systemd_action --service_name="${app}-notify-push" --action=restart
     
     if ! exec_occ notify_push:self-test; then
-        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
+        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${phpversion} $install_dir/occ notify_push:self-test\" to verify that everything is green."
     fi
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index f9ef75d..99da6d2 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -406,6 +406,7 @@ then
     elif ! exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w notify_push; then
         exec_occ app:install notify_push
     fi
+    exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
     mkdir -p /var/run/$app/
     chown $app: /var/run/$app/
@@ -444,7 +445,7 @@ then
     ynh_systemd_action --service_name="${app}-notify-push" --action=restart
 
     if ! exec_occ notify_push:self-test; then
-        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart $app-notify-push.service\", and run \"sudo -u $app php${phpversion} $final_path/occ notify_push:self-test\" to verify that everything is green."
+        ynh_print_warn --message="The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${phpversion} $install_dir/occ notify_push:self-test\" to verify that everything is green."
     fi
 fi