From c2460d7526069ed48ff2b0bd5a35c8c3f2086c76 Mon Sep 17 00:00:00 2001
From: sagessylu <sagessylu@free.fr>
Date: Sun, 15 Aug 2021 21:41:32 +0200
Subject: [PATCH 1/2] Add purge option to yunohost app remove

---
 data/actionsmap/yunohost.yml | 6 +++++-
 src/yunohost/app.py          | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 5df1c0877..bd9207528 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -673,7 +673,11 @@ app:
             api: DELETE /apps/<app>
             arguments:
                 app:
-                    help: App to delete
+                    help: App to remove
+                -p:
+                    full: --purge
+                    help: Remove with all app data
+                    action: store_true
 
         ### app_upgrade()
         upgrade:
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index a48400a8e..d6b459264 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -1187,12 +1187,13 @@ def dump_app_log_extract_for_debugging(operation_logger):
 
 
 @is_unit_operation()
-def app_remove(operation_logger, app):
+def app_remove(operation_logger, app, purge=False):
     """
     Remove app
 
-    Keyword argument:
+    Keyword arguments:
         app -- App(s) to delete
+        purge -- Remove with all app data
 
     """
     from yunohost.hook import hook_exec, hook_remove, hook_callback
@@ -1230,6 +1231,7 @@ def app_remove(operation_logger, app):
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
     env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
+    env_dict["YNH_APP_PURGE"] = purge
     operation_logger.extra.update({"env": env_dict})
     operation_logger.flush()
 

From 09efb86ff10ab4786cdf6a0350435832120ea9e4 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 18 Aug 2021 19:40:10 +0200
Subject: [PATCH 2/2] Improve help text for app remove --purge

---
 data/actionsmap/yunohost.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index bd9207528..bcd6a61c3 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -676,7 +676,7 @@ app:
                     help: App to remove
                 -p:
                     full: --purge
-                    help: Remove with all app data
+                    help: Also remove all application data
                     action: store_true
 
         ### app_upgrade()