From 932fad3a152d92a2771707c2f2894a52139ac666 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 14 Mar 2022 19:55:47 +0100
Subject: [PATCH] fix datadir remove

---
 scripts/remove | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 2cbe271..ff61138 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -21,6 +21,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -67,6 +68,14 @@ ynh_script_progression --message="Removing app main directory..." --weight=1
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE APP DATA DIR
+#=================================================
+ynh_script_progression --message="Removing app data directory..." --weight=1
+
+# Remove the app directory securely
+ynh_secure_remove --file="$datadir"
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
@@ -100,12 +109,6 @@ fi
 #=================================================
 ynh_script_progression --message="Removing various files..." --weight=1
 
-# Remove a cron file
-ynh_secure_remove --file="/etc/cron.d/$app"
-
-# Remove a directory securely
-ynh_secure_remove --file="/etc/$app"
-
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"