From 0131634eb9989eb9a6f7012e25eb1f09854e71fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 16 Nov 2023 16:04:57 +0100
Subject: [PATCH 1/2] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fadf645..f20f95a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -67,7 +67,7 @@ then
 	ynh_script_progression --message="Reconfiguring $app..." --weight=1
 
 	# Copy and set Wallabag dist configuration
-	#ynh_add_config --template="../conf/parameters.yml" --destination="$install_dir/app/config/parameters.yml"
+	#ynh_add_config --template="parameters.yml" --destination="$install_dir/app/config/parameters.yml"
 
 	#=================================================
 	# UPGRADE WALLABAG

From 4707e7d2dbab8bacc10fab686b41536ba5ac964d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 16 Nov 2023 16:06:44 +0100
Subject: [PATCH 2/2] cleaning

---
 hooks/post_user_create | 7 +++++--
 hooks/post_user_delete | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hooks/post_user_create b/hooks/post_user_create
index 40b0216..9b7a61f 100644
--- a/hooks/post_user_create
+++ b/hooks/post_user_create
@@ -3,6 +3,9 @@
 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
 user_email=$2
@@ -14,6 +17,6 @@ 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 \
+(cd "$install_dir" && \
+ sudo -u "$user" php${phpversion} "bin/console" --no-interaction --env=prod \
     fos:user:create "$username" "$user_email" "$user_pass")
diff --git a/hooks/post_user_delete b/hooks/post_user_delete
index 6a39516..bb2e7c1 100644
--- a/hooks/post_user_delete
+++ b/hooks/post_user_delete
@@ -3,11 +3,14 @@
 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 \
+(cd "$install_dir" && \
+ sudo -u "$user" php${phpversion} "bin/console" --no-interaction --env=prod \
     fos:user:deactivate "$username")