From a646f376a4d995dcf2a0a79dc9a3f9a408a337df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:49:53 +0100
Subject: [PATCH] Testing (#69)

* 4.3
---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 conf/nginx.conf |  5 -----
 manifest.json   |  4 ++--
 scripts/remove  | 12 ++++++------
 scripts/restore |  3 +--
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 0ec1d21..33c3318 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ SimpleTorrent is a a self-hosted remote torrent client, written in Go (golang).
 - Magnet RSS subscribing supported
 
 
-**Shipped version:** 1.3.9~ynh2
+**Shipped version:** 1.3.9~ynh3
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 5dd1746..d4f469e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ SimpleTorrent is a a self-hosted remote torrent client, written in Go (golang).
 - Magnet RSS subscribing supported
 
 
-**Version incluse :** 1.3.9~ynh2
+**Version incluse :** 1.3.9~ynh3
 
 
 
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d8ac826..f1a7df9 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,10 +1,5 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-  
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
 
   proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
diff --git a/manifest.json b/manifest.json
index 1aadb45..79b540b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Self-hosted remote torrent client",
         "fr": "Client torrent distant auto-hébergé"
     },
-    "version": "1.3.9~ynh2",
+    "version": "1.3.9~ynh3",
     "url": "https://github.com/boypt/simple-torrent",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -19,7 +19,7 @@
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.2.7"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/remove b/scripts/remove
index 8fef2b5..8ab2c82 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -55,12 +55,12 @@ ynh_secure_remove --file="$final_path"
 # REMOVE DATA DIR
 #=================================================
 
-# # Remove the app data directory with the command `yunohost app remove --purge`
-# if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
-# then
-#   ynh_script_progression --message="Removing $app data directory..." --weight=2
-#   ynh_secure_remove --file="$datadir"
-# fi
+# 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 9e0b1c3..7c8123b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,8 +34,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS