From 93888166b4f430224ece6e8ec0c48a5e6fc0fa8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 15 Mar 2024 12:43:40 +0100
Subject: [PATCH] Cleanup hooks

---
 hooks/post_user_create |  9 ++++++---
 hooks/post_user_delete | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hooks/post_user_create b/hooks/post_user_create
index 40b0216..44fba5b 100644
--- a/hooks/post_user_create
+++ b/hooks/post_user_create
@@ -2,6 +2,8 @@
 
 app="__APP__"
 user="__APP__"
+install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir)
+phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
 
 # Retrieve arguments
 username=$1
@@ -14,6 +16,7 @@ source /usr/share/yunohost/helpers
 user_pass=$(ynh_string_random)
 
 # Create the new user in Wallabag
-(cd "/var/www/$app" && \
- sudo -u "$user" php "bin/console" --no-interaction --env=prod \
-    fos:user:create "$username" "$user_email" "$user_pass")
+pushd "$install_dir" || ynh_die
+    sudo -u "$user" "php$phpversion" "bin/console" --no-interaction --env=prod \
+        fos:user:create "$username" "$user_email" "$user_pass"
+popd || ynh_die
diff --git a/hooks/post_user_delete b/hooks/post_user_delete
index 6a39516..ebf27c4 100644
--- a/hooks/post_user_delete
+++ b/hooks/post_user_delete
@@ -2,12 +2,15 @@
 
 app="__APP__"
 user="__APP__"
+install_dir=$(ynh_app_setting_get --app="$app" --key=install_dir)
+phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
 
 # Retrieve arguments
 username=$1
 purge=$2
 
-# Deactivate the user from Wallabg
-(cd "/var/www/$app" && \
- sudo -u "$user" php "bin/console" --no-interaction --env=prod \
-    fos:user:deactivate "$username")
+# Deactivate the user from Wallabag
+pushd "$install_dir" || ynh_die
+    sudo -u "$user" "php$phpversion" "bin/console" --no-interaction --env=prod \
+        fos:user:deactivate "$username"
+popd || ynh_die