From 1c038fab85303675e6d2b37ad6467d18e79163a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 1 Apr 2023 17:07:03 +0200
Subject: [PATCH 01/23] autoupdate

---
 .github/workflows/updater.sh  | 106 ----------------------------------
 .github/workflows/updater.yml |  50 ----------------
 manifest.toml                 |   1 +
 3 files changed, 1 insertion(+), 156 deletions(-)
 delete mode 100755 .github/workflows/updater.sh
 delete mode 100644 .github/workflows/updater.yml

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
deleted file mode 100755
index b20db5a..0000000
--- a/.github/workflows/updater.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
-assets="https://github.com/firefly-iii/firefly-iii/archive/refs/tags/$version.tar.gz"
-
-# Later down the script, we assume the version has only digits and dots
-# Sometimes the release name starts with a "v", so let's filter it out.
-# You may need more tweaks here if the upstream repository has different naming conventions.
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-    version=${version:1}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-echo "REPO=$repo" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-    echo "::warning ::No new version available"
-    exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-    echo "::warning ::A branch already exists for this update"
-    exit 0
-fi
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-# Let's download source tarball
-asset_url=$assets
-
-echo "Handling asset at $asset_url"
-
-src="app"
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename=${asset_url##*/}
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Get extension
-if [[ $filename == *.tar.gz ]]; then
-  extension=tar.gz
-else
-  extension=${filename##*.}
-fi
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-EOT
-echo "... conf/$src.src updated"
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
deleted file mode 100644
index 9358c83..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-            [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/${{ env.VERSION }})
-          draft: false
diff --git a/manifest.toml b/manifest.toml
index 8d7c72b..5517c8d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -54,6 +54,7 @@ ram.runtime = "50M"
         [resources.sources.main]
         url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.5.tar.gz"
         sha256 = "2253f00a6f32d12d31908f3d5fde8d67b0f20f9e70cdc186cefe80121cd3868c"
+        autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
 

From 065b9b37dec9af38bca05ae544965cde6971a6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 1 Apr 2023 17:08:12 +0200
Subject: [PATCH 02/23] Update manifest.toml

---
 manifest.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.toml b/manifest.toml
index 5517c8d..f760f0a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -55,6 +55,7 @@ ram.runtime = "50M"
         url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.5.tar.gz"
         sha256 = "2253f00a6f32d12d31908f3d5fde8d67b0f20f9e70cdc186cefe80121cd3868c"
         autoupdate.strategy = "latest_github_tag"
+        autoupdate.asset = "tarball"
 
     [resources.system_user]
 

From 9ecfafd918a66991c42a848304ffcab777fca17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:24:07 +0200
Subject: [PATCH 03/23] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index f760f0a..8531048 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduct
 code = "https://github.com/firefly-iii/firefly-iii"
 
 [integration]
-yunohost = ">= 11.1.15"
+yunohost = ">= 11.1.20"
 architectures = "all"
 multi_instance = true
 ldap = false

From 31b96856ab2663f72c4eba71f1aae52f77175310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:26:01 +0200
Subject: [PATCH 04/23] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 8531048..8b73300 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Firefly III"
 description.en = "Self-hosted financial manager"
 description.fr = "Gestionnaire de finances personnelles"
 
-version = "6.0.5~ynh1"
+version = "6.0.10~ynh1"
 
 maintainers = []
 
@@ -52,8 +52,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.5.tar.gz"
-        sha256 = "2253f00a6f32d12d31908f3d5fde8d67b0f20f9e70cdc186cefe80121cd3868c"
+        url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.10.tar.gz"
+        sha256 = "a3fb9f2daa5da136272aa92c23c0752d065229f227dcca35d437d1cd643b3976"
         autoupdate.strategy = "latest_github_tag"
         autoupdate.asset = "tarball"
 

From b61099a5e68557f98f52a7ba11fcf3a347ba0575 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 21 May 2023 09:26:06 +0000
Subject: [PATCH 05/23] 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 fd49f73..4ebf9f5 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 "Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
 
 
-**Shipped version:** 6.0.5~ynh1
+**Shipped version:** 6.0.10~ynh1
 
 **Demo:** https://demo.firefly-iii.org/login
 
diff --git a/README_fr.md b/README_fr.md
index ac1ae8a..828a4f1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 "Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
 
 
-**Version incluse :** 6.0.5~ynh1
+**Version incluse :** 6.0.10~ynh1
 
 **Démo :** https://demo.firefly-iii.org/login
 

From db01ece4a8200b96d8c01d099d23af449cec6a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:36:31 +0200
Subject: [PATCH 06/23] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 8b73300..6a3d12a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduct
 code = "https://github.com/firefly-iii/firefly-iii"
 
 [integration]
-yunohost = ">= 11.1.20"
+yunohost = ">= 11.1.19"
 architectures = "all"
 multi_instance = true
 ldap = false

From 82023c1765f2958eb85fd96a7c98f7199d559da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:39:51 +0200
Subject: [PATCH 07/23] fix

---
 doc/DESCRIPTION.md    | 2 +-
 doc/DESCRIPTION_fr.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index cc84909..2ccf760 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-"Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
+Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..a70d209
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'un tas d'outils externes, vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
\ No newline at end of file

From 4bb8d83b4609edea604de203fea93e5df6bbc175 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 21 May 2023 09:39:55 +0000
Subject: [PATCH 08/23] Auto-update README

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

diff --git a/README.md b/README.md
index 4ebf9f5..efaa4f4 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-"Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
+Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
 
 
 **Shipped version:** 6.0.10~ynh1
diff --git a/README_fr.md b/README_fr.md
index 828a4f1..e02c67a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,8 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-"Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
-
+Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'un tas d'outils externes, vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
 
 **Version incluse :** 6.0.10~ynh1
 

From 3a2ed4264db8e1f9501c4b5bbe2c9596fba4b291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:42:01 +0200
Subject: [PATCH 09/23] cleaning

---
 doc/DESCRIPTION.md    | 2 +-
 doc/DESCRIPTION_fr.md | 2 +-
 scripts/config        | 1 -
 scripts/install       | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 2ccf760..7944978 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
+Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index a70d209..2dc47e4 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -1 +1 @@
-Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'un tas d'outils externes, vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
\ No newline at end of file
+Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
\ No newline at end of file
diff --git a/scripts/config b/scripts/config
index 91c2de7..17e90cc 100644
--- a/scripts/config
+++ b/scripts/config
@@ -15,7 +15,6 @@ ynh_abort_if_errors
 # RETRIEVE ARGUMENTS
 #=================================================
 
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index dc66e36..12c7f51 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 
 random_key=$(ynh_string_random --length=32)
 email=$(ynh_user_get_info --username=$admin --key=mail)
-timezone="$(cat /etc/timezone)"
+timezone=$(cat /etc/timezone)
 
 fpm_footprint="low"
 fpm_free_footprint=0

From fc961b283b6d796c617c5ed11a010f516748db52 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 21 May 2023 09:42:10 +0000
Subject: [PATCH 10/23] 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 efaa4f4..8a22e28 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
+Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
 **Shipped version:** 6.0.10~ynh1
diff --git a/README_fr.md b/README_fr.md
index e02c67a..36a7dae 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'un tas d'outils externes, vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
+Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
 
 **Version incluse :** 6.0.10~ynh1
 

From 1b8a00e84126099199823fd8146d07cd071c1899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:46:28 +0200
Subject: [PATCH 11/23] fix

---
 scripts/_common.sh | 2 +-
 scripts/install    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 1a7049a..f586876 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Composer version
-YNH_COMPOSER_VERSION="2.5.4"
+YNH_COMPOSER_VERSION="2.5.5"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 12c7f51..2d98ad5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Installing composer dependencies..."
 
-ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir"
+ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
 
 #=================================================
 # ADD A CONFIGURATION

From 43fc120bb32d8b32bae45f4b4b507906658bc9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:52:52 +0200
Subject: [PATCH 12/23] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 2d98ad5..8138a42 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,8 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Installing composer dependencies..."
 
-ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
+#ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
+ynh_exec_warn_less ynh_install_composer create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10
 
 #=================================================
 # ADD A CONFIGURATION

From 92b91fad3392f240d48c7bbb55c77c8e7023478b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:53:59 +0200
Subject: [PATCH 13/23] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 8138a42..6df007f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Installing composer dependencies..."
 
 #ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
-ynh_exec_warn_less ynh_install_composer create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10
+ynh_exec_warn_less ynh_install_composer --install_args="create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10"
 
 #=================================================
 # ADD A CONFIGURATION

From 78c3f1ab2b72da86bdb45be6e383f12cea19f9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 11:57:11 +0200
Subject: [PATCH 14/23] Update install

---
 scripts/install | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6df007f..1982412 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Installing composer dependencies..."
 
 #ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
-ynh_exec_warn_less ynh_install_composer --install_args="create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10"
+ynh_exec_warn_less ynh_install_composer --install_args="--no-dev --prefer-dist"
 
 #=================================================
 # ADD A CONFIGURATION
@@ -83,9 +83,16 @@ chown $app "$install_dir/.env"
 #=================================================
 ynh_script_progression --message="Deploying..."
 
+#pushd "$install_dir"
+#	php$phpversion artisan migrate:refresh --seed
+#	php$phpversion artisan firefly-iii:upgrade-database
+#	php$phpversion artisan passport:install
+#popd
+
 pushd "$install_dir"
-	php$phpversion artisan migrate:refresh --seed
 	php$phpversion artisan firefly-iii:upgrade-database
+	php$phpversion artisan firefly-iii:correct-database
+	php$phpversion artisan firefly-iii:report-integrity
 	php$phpversion artisan passport:install
 popd
 

From a6b543d415db86e61061a878e0939d9d6c40e7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 12:19:47 +0200
Subject: [PATCH 15/23] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 1982412..cdce62e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,8 @@ ynh_add_nginx_config
 ynh_script_progression --message="Installing composer dependencies..."
 
 #ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
-ynh_exec_warn_less ynh_install_composer --install_args="--no-dev --prefer-dist"
+ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$install_dir
+ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$install_dir --commands="create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10"
 
 #=================================================
 # ADD A CONFIGURATION

From da3f86ce0b9d46b33768ef3ed565f81d62160d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 21 May 2023 12:43:22 +0200
Subject: [PATCH 16/23] Update install

---
 scripts/install | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index cdce62e..33f372d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,9 +65,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Installing composer dependencies..."
 
-#ynh_exec_warn_less ynh_install_composer --workdir="$install_dir"
 ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$install_dir
-ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$install_dir --commands="create-project grumpydictator/firefly-iii --no-dev --prefer-dist firefly-iii 6.0.10"
 
 #=================================================
 # ADD A CONFIGURATION
@@ -84,19 +82,19 @@ chown $app "$install_dir/.env"
 #=================================================
 ynh_script_progression --message="Deploying..."
 
-#pushd "$install_dir"
-#	php$phpversion artisan migrate:refresh --seed
-#	php$phpversion artisan firefly-iii:upgrade-database
-#	php$phpversion artisan passport:install
-#popd
-
 pushd "$install_dir"
+	php$phpversion artisan migrate:refresh --seed
 	php$phpversion artisan firefly-iii:upgrade-database
-	php$phpversion artisan firefly-iii:correct-database
-	php$phpversion artisan firefly-iii:report-integrity
 	php$phpversion artisan passport:install
 popd
 
+#pushd "$install_dir"
+#	php$phpversion artisan firefly-iii:upgrade-database
+#	php$phpversion artisan firefly-iii:correct-database
+#	php$phpversion artisan firefly-iii:report-integrity
+#	php$phpversion artisan passport:install
+#popd
+
 #=================================================
 # SETUP A CRON
 #=================================================

From 6e1dd93ddc285b15b1bf1680040727eb5db72a4b Mon Sep 17 00:00:00 2001
From: orhtej2 <2871798+orhtej2@users.noreply.github.com>
Date: Tue, 4 Jul 2023 00:11:36 +0200
Subject: [PATCH 17/23] Use `sendmail` to send mail.

There seems to be a problem in interop between Laravel's mail system and default ynh conf that allows unauthenticated SMTP usage. Using `sendmail` gets around this problem.
---
 conf/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/.env b/conf/.env
index c360ae8..322bb89 100644
--- a/conf/.env
+++ b/conf/.env
@@ -117,7 +117,7 @@ COOKIE_SECURE=false
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
-MAIL_MAILER=smtp
+MAIL_MAILER=sendmail
 MAIL_HOST=127.0.0.1
 MAIL_PORT=25
 MAIL_FROM=__EMAIL__
@@ -326,4 +326,4 @@ FIREFLY_III_LAYOUT=v1
 #
 # If you're stuck I understand you get desperate but look SOMEWHERE ELSE.
 #
-APP_URL=http://__DOMAIN____PATH__
\ No newline at end of file
+APP_URL=http://__DOMAIN____PATH__

From f0e45113f9aaaa688cabc12e816a54adeadd0e49 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 26 Aug 2023 08:19:07 +0200
Subject: [PATCH 18/23] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 6a3d12a..06ae895 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduct
 code = "https://github.com/firefly-iii/firefly-iii"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false

From 428499b0b7f83363201e8c3a504223bd72d82ff6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 26 Aug 2023 08:20:46 +0200
Subject: [PATCH 19/23] Update install

---
 scripts/install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 33f372d..f232806 100755
--- a/scripts/install
+++ b/scripts/install
@@ -50,11 +50,6 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 

From 0329c626b9c738234c6e44bf0f4d5381f0d70b0f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 26 Aug 2023 08:22:59 +0200
Subject: [PATCH 20/23] Update install

---
 scripts/install | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/install b/scripts/install
index f232806..785553a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -77,19 +77,19 @@ chown $app "$install_dir/.env"
 #=================================================
 ynh_script_progression --message="Deploying..."
 
-pushd "$install_dir"
-	php$phpversion artisan migrate:refresh --seed
-	php$phpversion artisan firefly-iii:upgrade-database
-	php$phpversion artisan passport:install
-popd
-
 #pushd "$install_dir"
+#	php$phpversion artisan migrate:refresh --seed
 #	php$phpversion artisan firefly-iii:upgrade-database
-#	php$phpversion artisan firefly-iii:correct-database
-#	php$phpversion artisan firefly-iii:report-integrity
 #	php$phpversion artisan passport:install
 #popd
 
+pushd "$install_dir"
+	php$phpversion artisan firefly-iii:upgrade-database
+	php$phpversion artisan firefly-iii:correct-database
+	php$phpversion artisan firefly-iii:report-integrity
+	php$phpversion artisan passport:install
+popd
+
 #=================================================
 # SETUP A CRON
 #=================================================

From 88e772074e3aa888d9596f0b3935ce219b10faa7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 26 Aug 2023 08:24:13 +0200
Subject: [PATCH 21/23] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 06ae895..7176499 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Firefly III"
 description.en = "Self-hosted financial manager"
 description.fr = "Gestionnaire de finances personnelles"
 
-version = "6.0.10~ynh1"
+version = "6.0.20~ynh1"
 
 maintainers = []
 
@@ -52,8 +52,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.10.tar.gz"
-        sha256 = "a3fb9f2daa5da136272aa92c23c0752d065229f227dcca35d437d1cd643b3976"
+        url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.20.tar.gz"
+        sha256 = "ea21f4c13ab932094a9be9de6b1988d034b802c589418b6dbd325004ab622f31"
         autoupdate.strategy = "latest_github_tag"
         autoupdate.asset = "tarball"
 

From 9ec8ccd28787dfb1ce30b736b6095d45b98efaff Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 26 Aug 2023 06:24:20 +0000
Subject: [PATCH 22/23] 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 8a22e28..1c196d9 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Shipped version:** 6.0.10~ynh1
+**Shipped version:** 6.0.20~ynh1
 
 **Demo:** https://demo.firefly-iii.org/login
 
diff --git a/README_fr.md b/README_fr.md
index 36a7dae..d2cfc19 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) po
 
 Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
 
-**Version incluse :** 6.0.10~ynh1
+**Version incluse :** 6.0.20~ynh1
 
 **Démo :** https://demo.firefly-iii.org/login
 

From 079a8b98b97da2b5ced8b4040347e5e73c0b831d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 26 Aug 2023 11:41:48 +0200
Subject: [PATCH 23/23] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index f586876..1db13c2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Composer version
-YNH_COMPOSER_VERSION="2.5.5"
+YNH_COMPOSER_VERSION="2.5.8"
 
 #=================================================
 # PERSONAL HELPERS