From 2f3c40f2ad45e2b5b250af039bc94435d87c63a5 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sun, 28 Jul 2019 08:33:23 +0200
Subject: [PATCH 1/3] Fix upgrade for #45

Temporarily fix #45
---
 scripts/upgrade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3a42927..9aa3b3c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -129,6 +129,8 @@ ynh_add_fpm_config
 ynh_print_info "Upgrading logrotate configuration..."
 
 # Use logrotate to manage app-specific logfile(s)
+# Temporary fix for .txt log file and ynh_use_logrotate
+ln -s "$final_path/data/log.txt" "$final_path/data/log.log"
 ynh_use_logrotate --non-append
 
 #=================================================

From b515e255d34c1a0d5f3243c45a9ad93dc8ecce85 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 26 Sep 2019 14:21:49 +0200
Subject: [PATCH 2/3] Fix that damn log issue

---
 scripts/install | 2 ++
 scripts/upgrade | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 2e4922e..aa7de30 100644
--- a/scripts/install
+++ b/scripts/install
@@ -152,6 +152,8 @@ ynh_print_info "Configuring log rotation..."
 ###		- And the section "SETUP LOGROTATE" in the upgrade script
 
 # Use logrotate to manage application logfile(s)
+# We gotta create the file explicitly to avoid triggering https://github.com/YunoHost/issues/issues/1390
+touch "$final_path/data/log.txt"
 ynh_use_logrotate "$final_path/data/log.txt"
 
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 9aa3b3c..3205547 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -130,7 +130,11 @@ ynh_print_info "Upgrading logrotate configuration..."
 
 # Use logrotate to manage app-specific logfile(s)
 # Temporary fix for .txt log file and ynh_use_logrotate
-ln -s "$final_path/data/log.txt" "$final_path/data/log.log"
+if [ -d "$final_path/data/log.txt" ]
+then
+    rm -r "$final_path/data/log.txt"
+    touch "$final_path/data/log.txt"
+fi
 ynh_use_logrotate --non-append
 
 #=================================================

From a1f3519d218ecf0b44fa503a8a463e337263d5a9 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 8 Oct 2019 21:04:27 +0200
Subject: [PATCH 3/3] Bumping app version + yunohost requirement

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3d3ee9a..ae85bff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "id": "shaarli",
   "packaging_format": 1,
   "requirements": {
-   "yunohost": ">= 3.0.0"
+   "yunohost": ">= 3.6.5"
   },
   "description": {
     "en": "The personal, minimalist, super-fast, no-database delicious clone",
@@ -16,7 +16,7 @@
   },
   "url": "https://github.com/shaarli/Shaarli",
   "license": "MIT",
-  "version": "0.10.4~ynh2",
+  "version": "0.10.4~ynh3",
   "multi_instance": true,
   "services": [
         "nginx",