From 2bad1ff60310b77f98cd3211c3cf226258361e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 3 Nov 2021 20:35:33 +0100
Subject: [PATCH] Testing (#68)

*keep config
---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 check_process   |  6 +++++-
 manifest.json   |  2 +-
 scripts/upgrade | 10 +++-------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index accfee1..0ec1d21 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~ynh1
+**Shipped version:** 1.3.9~ynh2
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 2e72c6b..5dd1746 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~ynh1
+**Version incluse :** 1.3.9~ynh2
 
 
 
diff --git a/check_process b/check_process
index f7fbeaa..f3e8ed7 100644
--- a/check_process
+++ b/check_process
@@ -14,6 +14,7 @@
 		setup_public=1
 		upgrade=1
 		upgrade=1   from_commit=295026023fdb74f5bf210093f5b0622bae2982f3
+		upgrade=1   from_commit=bbce7cfa6cb8916671a4fec9e8a73095f74a0c9d
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -23,4 +24,7 @@ Notification=none
 ;;; Upgrade options
 	; commit=295026023fdb74f5bf210093f5b0622bae2982f3
 		name= Upgrade to 1.2.12 (#10)
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=4533&
\ No newline at end of file
+	; commit=bbce7cfa6cb8916671a4fec9e8a73095f74a0c9d
+		name= Upgrade to 1.3.7 (#63)
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=4533&
+		
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b0d41bd..1aadb45 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~ynh1",
+    "version": "1.3.9~ynh2",
     "url": "https://github.com/boypt/simple-torrent",
     "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/upgrade b/scripts/upgrade
index 3e414b7..b7e46f0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -86,11 +86,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# Remove the app directory securely
-	ynh_secure_remove --file="$final_path"
-
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir=$final_path --source_id="$architecture"
+	ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/config.yml"
 
 	pushd "$final_path"
 		gzip --decompress $(ynh_detect_arch).gz
@@ -114,9 +111,9 @@ ynh_add_nginx_config
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Modifying a config file..." --weight=1
+# ynh_script_progression --message="Modifying a config file..." --weight=1
 
-ynh_add_config --template="../conf/config.default.yml" --destination="$final_path/config.yml"
+# ynh_add_config --template="../conf/config.default.yml" --destination="$final_path/config.yml"
 
 #=================================================
 # CREATE DIRECTORIES
@@ -127,7 +124,6 @@ mkdir -p /home/yunohost.app/$app/{torrents,downloads}
 chown -R $app:www-data /home/yunohost.app/$app
 chmod 755 /home/yunohost.app/$app/{torrents,downloads}
 
-#=================================================
 #=================================================
 # SETUP SYSTEMD
 #=================================================