From 383f2a004526c3760cd5622f80773e3ab9d9c9e9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 14 Nov 2021 16:01:21 +0100
Subject: [PATCH 1/6] Add --purge option

---
 manifest.json   |  2 +-
 scripts/backup  |  3 ++-
 scripts/install |  3 +++
 scripts/remove  | 12 ++++++++++++
 scripts/restore |  3 +--
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index f4a33a5..40e16bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
         "email": "pierre@kayou.io"
     },
     "requirements": {
-        "yunohost": ">= 4.2.8.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/backup b/scripts/backup
index 1a1944a..4127420 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -27,6 +27,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -84,7 +85,7 @@ ynh_backup --src_path="/etc/cron.d/$app"
 #=================================================
 ynh_print_info --message="Backing up data directory..."
 
-ynh_backup --src_path="/home/yunohost.app/${app}/data" --is_big
+ynh_backup --src_path="$datadir" --is_big
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index 8306846..f39eb2e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -130,9 +130,12 @@ ynh_add_nginx_config
 #=================================================
 # CREATE THE DATA DIRECTORY
 #=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
 
 # Define app's data directory
 datadir="/home/yunohost.app/$app/data"
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+
 # Create app folders
 mkdir -p "$datadir"
 
diff --git a/scripts/remove b/scripts/remove
index b84d5bf..024ed93 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -46,6 +47,17 @@ ynh_script_progression --message="Removing app main directory..." --weight=3
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE DATA DIR
+#=================================================
+
+# Remove the data directory if --purge option is used
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+	ynh_script_progression --message="Removing app data directory..." --weight=1
+	ynh_secure_remove --file="$datadir"
+fi
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index a3067d4..16ca3c4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,6 +28,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
@@ -119,8 +120,6 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 #=================================================
 ynh_script_progression --message="Restoring data directory..." --weight=2
 
-datadir="/home/yunohost.app/$app/data"
-
 # Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup.
 ynh_restore_file --origin_path="$datadir" --not_mandatory
 

From 28f82d059ded0bcc4350506050ffa1bfd4447e89 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 16 Nov 2021 09:03:59 +0100
Subject: [PATCH 2/6] set datadir

---
 scripts/upgrade | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8dfdcea..1a223d6 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,6 +50,12 @@ if [ -z "$final_path" ]; then
 	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
+# If datadir doesn't exist, create it
+if [ -z "$datadir" ]; then
+    datadir=/home/yunohost.app/$app
+    ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+fi
+
 # Remove the option backup_core_only if it's in the settings.yml file
 ynh_app_setting_delete --app=$app --key=backup_core_only
 

From c7aed56de70bae5482438629a89d53ed721e1ded Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 16 Nov 2021 09:05:43 +0100
Subject: [PATCH 3/6] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 40e16bf..f4a33a5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
         "email": "pierre@kayou.io"
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 4.2.8.3"
     },
     "multi_instance": true,
     "services": [

From 144455835313590570a7f1c71b9de2fa02078439 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 16 Nov 2021 09:30:25 +0100
Subject: [PATCH 4/6] 22.2.3

---
 manifest.json                     | 2 +-
 scripts/upgrade.d/upgrade.last.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index f4a33a5..40a41d8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "22.2.2~ynh1",
+    "version": "22.2.3~ynh1",
     "url": "https://nextcloud.com",
     "upstream": {
         "license": "AGPL-3.0",
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index c26aeae..b210a00 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available Nextcloud version
-next_version="22.2.2"
+next_version="22.2.3"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="943be7dbd375f4b866dcfd9821533ff39bebfd4d3ba91f8cf13905fc3fc64df0"
+nextcloud_source_sha256="66a29a6a490738c0abedb677cb68c7c91fabab3e6419a3c99d8b406899eb942a"

From a9de4b9986d1576837a07a6fa8b4c7289487309a Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Tue, 16 Nov 2021 08:30:31 +0000
Subject: [PATCH 5/6] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c5828c2..193b7e9 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 22.2.2~ynh1
+**Shipped version:** 22.2.3~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index d384a90..d4fa816 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 22.2.2~ynh1
+**Version incluse :** 22.2.3~ynh1
 
 **Démo :** https://demo.nextcloud.com/
 

From 13c7323f2d2331aed3a627d9a121c5d587b9b4b1 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Wed, 17 Nov 2021 08:09:24 +0000
Subject: [PATCH 6/6] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c5828c2..193b7e9 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 22.2.2~ynh1
+**Shipped version:** 22.2.3~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index d384a90..d4fa816 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 22.2.2~ynh1
+**Version incluse :** 22.2.3~ynh1
 
 **Démo :** https://demo.nextcloud.com/