From 7ec8ac4cbe3ecac0f0b897a7b4bf558107d341f3 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 25 Jul 2022 21:02:57 +0200
Subject: [PATCH 1/3] Fix upgrade

---
 manifest.json   | 2 +-
 scripts/upgrade | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 8797b35..eab2505 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Forum software that is easy to use, powerful, and highly customisable",
         "fr": "Forum facile à utiliser, puissant et hautement personnalisable"
     },
-    "version": "3.3.8~ynh1",
+    "version": "3.3.8~ynh2",
     "url": "http://www.phpbb.com/",
     "upstream": {
         "license": "GPL-2.0-only",
diff --git a/scripts/upgrade b/scripts/upgrade
index d77cb7f..b5869f1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -118,6 +118,10 @@ ynh_script_progression --message="Upgrading the $app..." --weight=1
 
 ynh_exec_as $app php${phpversion} "$final_path/bin/phpbbcli.php" --no-interaction db:migrate --safe-mode
 
+if [ -e "$final_path/install_old" ]; then
+	ynh_secure_remove --file="$final_path/install_old"
+fi
+
 if [ -e "$final_path/install" ]; then
 	ynh_exec_as $app mv "$final_path/install" "$final_path/install_old"
 fi

From c4defd62a635201d929eb8b9d69ff6502fb0614a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 25 Jul 2022 19:03:03 +0000
Subject: [PATCH 2/3] 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 15ed2fe..b360af1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 phpBB is a free flat-forum bulletin board software solution that can be used to stay in touch with a group of people or can power your entire website. With an extensive database of user-created extensions and styles database containing hundreds of style and image packages to customise your board, you can create a very unique forum in minutes.
 
 
-**Shipped version:** 3.3.8~ynh1
+**Shipped version:** 3.3.8~ynh2
 
 **Demo:** https://www.phpbb.com/demo/
 
diff --git a/README_fr.md b/README_fr.md
index 5cb5d47..b4be86b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 phpBB is a free flat-forum bulletin board software solution that can be used to stay in touch with a group of people or can power your entire website. With an extensive database of user-created extensions and styles database containing hundreds of style and image packages to customise your board, you can create a very unique forum in minutes.
 
 
-**Version incluse :** 3.3.8~ynh1
+**Version incluse :** 3.3.8~ynh2
 
 **Démo :** https://www.phpbb.com/demo/
 

From 2b4300260b1a89cb8d43006650639e8869a399b7 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 25 Jul 2022 21:05:57 +0200
Subject: [PATCH 3/3] Update check_process

---
 check_process | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 1f73ffc..1b53c0e 100644
--- a/check_process
+++ b/check_process
@@ -16,6 +16,8 @@
 		upgrade=1
 		# 3.3.4~ynh3
 		upgrade=1	from_commit=28f03211e7354cd7a1e34ec379e06e4bda25fbeb
+		# 3.3.5~ynh1
+		upgrade=1	from_commit=029929ec9f9bd5a702e89c5692069c3ebaaa2e9a
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -23,6 +25,3 @@
 ;;; Options
 Email=
 Notification=none
-;;; Upgrade options
-	; commit=28f03211e7354cd7a1e34ec379e06e4bda25fbeb
-		name=3.3.4~ynh3