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/54] 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 < 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 ' - author: 'yunohost-bot ' - 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/54] 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/54] 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/54] 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 Date: Sun, 21 May 2023 09:26:06 +0000 Subject: [PATCH 05/54] 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/54] 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/54] 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 Date: Sun, 21 May 2023 09:39:55 +0000 Subject: [PATCH 08/54] 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/54] 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 Date: Sun, 21 May 2023 09:42:10 +0000 Subject: [PATCH 10/54] 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/54] 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/54] 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/54] 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/54] 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/54] 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/54] 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/54] 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 Date: Sat, 26 Aug 2023 08:19:07 +0200 Subject: [PATCH 18/54] 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 Date: Sat, 26 Aug 2023 08:20:46 +0200 Subject: [PATCH 19/54] 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 Date: Sat, 26 Aug 2023 08:22:59 +0200 Subject: [PATCH 20/54] 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 Date: Sat, 26 Aug 2023 08:24:13 +0200 Subject: [PATCH 21/54] 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 Date: Sat, 26 Aug 2023 06:24:20 +0000 Subject: [PATCH 22/54] 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 Date: Sat, 26 Aug 2023 11:41:48 +0200 Subject: [PATCH 23/54] 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 From 7a85e6deba92849deaf16a8694e6a7b3e6f7eedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:08:51 +0100 Subject: [PATCH 24/54] Update manifest.toml --- manifest.toml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7176499..e2ae28f 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.20~ynh1" +version = "6.1.4~ynh1" maintainers = [] @@ -20,8 +20,11 @@ code = "https://github.com/firefly-iii/firefly-iii" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" @@ -52,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.0.20.tar.gz" - sha256 = "ea21f4c13ab932094a9be9de6b1988d034b802c589418b6dbd325004ab622f31" + url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.4.tar.gz" + sha256 = "69df1131e25a1dab67fc8c48097478503f53da6d7011c7c6e913773a5b2c9418" autoupdate.strategy = "latest_github_tag" autoupdate.asset = "tarball" @@ -65,7 +68,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-zip php8.2-mysql php8.2-xml php8.2-intl php8.2-mbstring php8.2-gd php8.2-curl php8.2-bcmath php8.2-opcache php8.2-ldap" + packages = "mariadb-server, php8.2-zip, php8.2-mysql, php8.2-xml, php8.2-intl, php8.2-mbstring php8.2-gd, php8.2-curl, php8.2-bcmath, php8.2-opcache, php8.2-ldap" [resources.database] type = "mysql" From 8a21a7219d1063265ad42f6a5f868bdfb279a4b6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 Jan 2024 22:08:56 +0000 Subject: [PATCH 25/54] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1c196d9..2a781b7 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.20~ynh1 +**Shipped version:** 6.1.4~ynh1 **Demo:** https://demo.firefly-iii.org/login @@ -32,7 +32,7 @@ Firefly III is a manager for your personal finances. It can help you keep track * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index d2cfc19..99a2e60 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.20~ynh1 +**Version incluse :** 6.1.4~ynh1 **Démo :** https://demo.firefly-iii.org/login @@ -31,7 +31,7 @@ Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous a * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 9283a4e48ff17198220fb3c6c832a7a87c5834c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:10:45 +0100 Subject: [PATCH 26/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e2ae28f..39318e4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,7 +46,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["de_DE", "en_US", "es_ES", "fr_FR", "it_IT", "nl_NL", "pt_PT"] default = "fr_FR" From c63efea33fbe23441c6d7c79cf442cc1efa7960c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 2 Jan 2024 23:13:36 +0100 Subject: [PATCH 27/54] cleaning --- scripts/install | 7 ++----- scripts/remove | 14 -------------- scripts/restore | 22 ++++++---------------- scripts/upgrade | 14 +++----------- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/scripts/install b/scripts/install index 785553a..e4cd513 100755 --- a/scripts/install +++ b/scripts/install @@ -35,7 +35,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= ynh_script_progression --message="Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" @@ -47,10 +46,8 @@ chmod -R 775 $install_dir/storage #================================================= ynh_script_progression --message="Configuring PHP-FPM..." -# Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -67,7 +64,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$inst #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" @@ -95,7 +92,7 @@ popd #================================================= ynh_script_progression --message="Setuping a cron..." -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/remove b/scripts/remove index 76dc342..6a67d42 100755 --- a/scripts/remove +++ b/scripts/remove @@ -14,24 +14,10 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." - -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 5749a98..33d4b55 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,20 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -42,9 +28,13 @@ ynh_script_progression --message="Restoring the MySQL database..." ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 2b5b30d..78dfd26 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,7 +53,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" fi @@ -66,15 +65,8 @@ chmod -R 775 $install_dir/storage #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." - -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -91,7 +83,7 @@ ynh_exec_warn_less ynh_install_composer #================================================= # ynh_script_progression --message="Updating a configuration file..." -# ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +# ynh_add_config --template=".env" --destination="$install_dir/.env" # chmod 400 "$install_dir/.env" # chown $app "$install_dir/.env" @@ -115,7 +107,7 @@ popd #================================================= ynh_script_progression --message="Setuping a cron..." -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" From 87c29627efa663bb7f1af763b2b51a6bfdc3246b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 3 Jan 2024 08:40:02 +0100 Subject: [PATCH 28/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7176499..dc2e9fc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,7 +65,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-zip php8.2-mysql php8.2-xml php8.2-intl php8.2-mbstring php8.2-gd php8.2-curl php8.2-bcmath php8.2-opcache php8.2-ldap" + packages = "mariadb-server, php8.3-zip, php8.3-mysql, php8.3-xml, php8.3-intl, php8.3-mbstring, php8.3-gd, php8.3-curl, php8.3-bcmath, php8.3-opcache, php8.3-ldap" [resources.database] type = "mysql" From 2904bb1f29f209b1774fa55b6cdf306f273a51eb Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 15 Feb 2024 17:58:51 +0100 Subject: [PATCH 29/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2baa8b8..dfa7f94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.4.tar.gz" sha256 = "69df1131e25a1dab67fc8c48097478503f53da6d7011c7c6e913773a5b2c9418" - autoupdate.strategy = "latest_github_tag" + autoupdate.strategy = "latest_github_release" autoupdate.asset = "tarball" [resources.system_user] From 333e390547b0832eebd76148f1ea4addb2d6294b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Feb 2024 16:58:55 +0000 Subject: [PATCH 30/54] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2a781b7..a32ca49 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -47,4 +47,4 @@ or sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 99a2e60..063a018 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ From 2c1d8bf844d43af0f0083d2accb42595c57b46cb Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 10:55:03 +0100 Subject: [PATCH 31/54] update to 6.1.11 --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index dfa7f94..308fb95 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.1.4~ynh1" +version = "6.1.11~ynh1" maintainers = [] @@ -55,10 +55,10 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.4.tar.gz" - sha256 = "69df1131e25a1dab67fc8c48097478503f53da6d7011c7c6e913773a5b2c9418" + url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.11.zip" + sha256 = "f6e3df061c9351daf8b70935e30b5ae6d8650efae27d1cc988e1c2a917d8de87" autoupdate.strategy = "latest_github_release" - autoupdate.asset = "tarball" + autoupdate.asset = "zipball" [resources.system_user] From 0f0bdc30fe5310843a700e4ef4ed723c8877bb6c Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 10:55:50 +0100 Subject: [PATCH 32/54] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a32ca49..cf915be 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.1.4~ynh1 +**Shipped version:** 6.1.11~ynh1 **Demo:** https://demo.firefly-iii.org/login @@ -47,4 +47,4 @@ or sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** From 5dd0d6dafc006e57a69a7476a78db736549121da Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 10:58:25 +0100 Subject: [PATCH 33/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 308fb95..02c2adc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,7 +55,7 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/firefly-iii/firefly-iii/archive/refs/tags/v6.1.11.zip" + url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.11/FireflyIII-v6.1.11.zip" sha256 = "f6e3df061c9351daf8b70935e30b5ae6d8650efae27d1cc988e1c2a917d8de87" autoupdate.strategy = "latest_github_release" autoupdate.asset = "zipball" From f7abc82e7490633eb2e4bfb0345b13759b1256e3 Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 11:10:04 +0100 Subject: [PATCH 34/54] Update upgrade --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 78dfd26..3536227 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,10 +95,11 @@ ynh_script_progression --message="Deploying..." pushd "$install_dir" ynh_secure_remove --file="bootstrap/cache/*" + php$phpversion artisan migrate --seed + php$phpversion artisan firefly-iii:decrypt-all php$phpversion artisan cache:clear - php$phpversion artisan migrate --seed php$phpversion artisan firefly-iii:upgrade-database - php$phpversion artisan passport:install + php$phpversion artisan passport:keys php$phpversion artisan cache:clear popd From b163dd916123df6880b491ba8cfd1cd142ddbef5 Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 11:11:00 +0100 Subject: [PATCH 35/54] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 02c2adc..1555308 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.1.11~ynh1" +version = "6.1.11~ynh2" maintainers = [] From 5ab0ef4ec673851ed9c79a745949783363ac006e Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 11:16:36 +0100 Subject: [PATCH 36/54] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3536227..100978c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ pushd "$install_dir" php$phpversion artisan firefly-iii:decrypt-all php$phpversion artisan cache:clear php$phpversion artisan firefly-iii:upgrade-database - php$phpversion artisan passport:keys + php$phpversion artisan passport:keys || true php$phpversion artisan cache:clear popd From 2d44fc7cd3e0e3f00eeac6546552260d494920a5 Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 11:52:23 +0100 Subject: [PATCH 37/54] debug --- scripts/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index e4cd513..6dbb3cd 100755 --- a/scripts/install +++ b/scripts/install @@ -39,6 +39,9 @@ ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" + +ls -al "$install_dir" + chmod -R 775 $install_dir/storage #================================================= From e49335b5b96cf343856ec8d1380c86e170ef62ae Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 12:41:05 +0100 Subject: [PATCH 38/54] Update manifest.toml --- manifest.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1555308..ed3e21a 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.1.11~ynh2" +version = "6.1.11~ynh1" maintainers = [] @@ -57,6 +57,8 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.11/FireflyIII-v6.1.11.zip" sha256 = "f6e3df061c9351daf8b70935e30b5ae6d8650efae27d1cc988e1c2a917d8de87" + extract = true + in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "zipball" From 6cc01ab28557bc758890b2d3b260b5a326717acf Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 12:45:41 +0100 Subject: [PATCH 39/54] Update install --- scripts/install | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 6dbb3cd..4f501ef 100755 --- a/scripts/install +++ b/scripts/install @@ -39,9 +39,6 @@ ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" - -ls -al "$install_dir" - chmod -R 775 $install_dir/storage #================================================= @@ -55,13 +52,6 @@ ynh_add_nginx_config #================================================= # SPECIFIC SETUP -#================================================= -# INSTALL COMPOSER DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing composer dependencies..." - -ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$install_dir - #================================================= # ADD A CONFIGURATION #================================================= @@ -72,6 +62,13 @@ ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" +#================================================= +# INSTALL COMPOSER DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing composer dependencies..." + +ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$install_dir + #================================================= # DEPLOY #================================================= From 578c9d2f177814d8004f5d88abaffa6ab7dda90a Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 12:49:25 +0100 Subject: [PATCH 40/54] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4f501ef..3997e0e 100755 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,7 @@ 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 + php$phpversion artisan passport:keys popd #================================================= From 07eaa4b15e25ba93549051e87d2964e5cc480470 Mon Sep 17 00:00:00 2001 From: Philipp Stappert Date: Wed, 20 Mar 2024 12:51:18 +0100 Subject: [PATCH 41/54] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3997e0e..8f8534c 100755 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,7 @@ 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:keys + php$phpversion artisan passport:keys || true popd #================================================= From 03650f992c5960e75d9b0399cffe5fe3c1abfaf4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Tue, 23 Apr 2024 17:43:51 +0200 Subject: [PATCH 42/54] Update manifest.toml: composer wants us to stick to php8.2 ? --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ed3e21a..69841c5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -70,7 +70,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.3-zip, php8.3-mysql, php8.3-xml, php8.3-intl, php8.3-mbstring, php8.3-gd, php8.3-curl, php8.3-bcmath, php8.3-opcache, php8.3-ldap" + packages = "mariadb-server, php8.2-zip, php8.2-mysql, php8.2-xml, php8.2-intl, php8.2-mbstring, php8.2-gd, php8.2-curl, php8.2-bcmath, php8.2-opcache, php8.2-ldap" [resources.database] type = "mysql" From fcc27145fa80190f1e725cc977d56eb4d1dbdfb3 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Tue, 23 Apr 2024 17:58:47 +0200 Subject: [PATCH 43/54] Update manifest.toml: nevermind, we do need php8.3 ... --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 69841c5..ed3e21a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -70,7 +70,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-zip, php8.2-mysql, php8.2-xml, php8.2-intl, php8.2-mbstring, php8.2-gd, php8.2-curl, php8.2-bcmath, php8.2-opcache, php8.2-ldap" + packages = "mariadb-server, php8.3-zip, php8.3-mysql, php8.3-xml, php8.3-intl, php8.3-mbstring, php8.3-gd, php8.3-curl, php8.3-bcmath, php8.3-opcache, php8.3-ldap" [resources.database] type = "mysql" From d1a1295ed5eb0510002b30a3c0b815bcddfb82a8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 24 Apr 2024 18:26:52 +0200 Subject: [PATCH 44/54] Simplify the php fpm conf mess and other unecessarily verbose stuff --- scripts/backup | 22 ---------------- scripts/change_url | 10 -------- scripts/install | 37 ++++----------------------- scripts/remove | 10 ++------ scripts/restore | 10 +------- scripts/upgrade | 62 ++++++++-------------------------------------- 6 files changed, 18 insertions(+), 133 deletions(-) diff --git a/scripts/backup b/scripts/backup index 35afc88..cae3226 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -15,28 +9,12 @@ source /usr/share/yunohost/helpers #================================================= ynh_print_info --message="Declaring files to be backed up..." -#================================================= -# BACKUP THE APP MAIN DIR -#================================================= - ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE NGINX CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - ynh_backup --src_path="/etc/cron.d/$app" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 1fbf84a..fe39bca 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,18 +1,8 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - email=$(ynh_user_get_info --username=$admin --key=mail) timezone="$(cat /etc/timezone)" diff --git a/scripts/install b/scripts/install index 8f8534c..992cfea 100755 --- a/scripts/install +++ b/scripts/install @@ -1,34 +1,12 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - random_key=$(ynh_string_random --length=32) email=$(ynh_user_get_info --username=$admin --key=mail) timezone=$(cat /etc/timezone) - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - ynh_app_setting_set --app=$app --key=random_key --value=$random_key -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -42,11 +20,12 @@ chown -R $app:www-data "$install_dir" chmod -R 775 $install_dir/storage #================================================= -# PHP-FPM CONFIGURATION +# SYSTEL CONFIGURATIONS #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_script_progression --message="Add system configurations related to $app..." + +ynh_add_fpm_config ynh_add_nginx_config @@ -55,7 +34,7 @@ ynh_add_nginx_config #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." +ynh_script_progression --message="Adding $app configuration..." ynh_add_config --template=".env" --destination="$install_dir/.env" @@ -74,12 +53,6 @@ ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$inst #================================================= 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 firefly-iii:upgrade-database php$phpversion artisan firefly-iii:correct-database diff --git a/scripts/remove b/scripts/remove index 6a67d42..1c9db3a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,18 +1,12 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing configurations related to $app..." ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 33d4b55..71a36d5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -30,7 +24,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." +ynh_script_progression --message="Restoring configurations related to $app..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -43,8 +37,6 @@ chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION #================================================= -# RELOAD NGINX AND PHP-FPM -#================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." ynh_systemd_action --service_name=php$phpversion-fpm --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 100978c..15dbb84 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,60 +1,18 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - email=$(ynh_user_get_info --username=$admin --key=mail) timezone="$(cat /etc/timezone)" -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." +ynh_script_progression --message="Upgrading source files..." - ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" -fi +ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -65,7 +23,7 @@ chmod -R 775 $install_dir/storage #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config ynh_add_nginx_config @@ -94,13 +52,13 @@ ynh_exec_warn_less ynh_install_composer ynh_script_progression --message="Deploying..." pushd "$install_dir" - ynh_secure_remove --file="bootstrap/cache/*" - php$phpversion artisan migrate --seed - php$phpversion artisan firefly-iii:decrypt-all - php$phpversion artisan cache:clear - php$phpversion artisan firefly-iii:upgrade-database - php$phpversion artisan passport:keys || true - php$phpversion artisan cache:clear + ynh_secure_remove --file="bootstrap/cache/*" + php$phpversion artisan migrate --seed + php$phpversion artisan firefly-iii:decrypt-all + php$phpversion artisan cache:clear + php$phpversion artisan firefly-iii:upgrade-database + php$phpversion artisan passport:keys || true + php$phpversion artisan cache:clear popd #================================================= From bb6634d57afa79c2c6f17e2fd111edbdd0e4b7b4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 24 Apr 2024 18:28:00 +0200 Subject: [PATCH 45/54] Let's try to remove the composer calls from install and upgrade... --- scripts/install | 7 ------- scripts/upgrade | 5 ----- 2 files changed, 12 deletions(-) diff --git a/scripts/install b/scripts/install index 992cfea..b552d5c 100755 --- a/scripts/install +++ b/scripts/install @@ -41,13 +41,6 @@ ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" -#================================================= -# INSTALL COMPOSER DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing composer dependencies..." - -ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$install_dir - #================================================= # DEPLOY #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 15dbb84..d862fa6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,11 +30,6 @@ ynh_add_nginx_config #================================================= # SPECIFIC UPGRADE #================================================= -# UPDATE PHP DEPENDENCIES -#================================================= -ynh_script_progression --message="Updating PHP dependencies..." - -ynh_exec_warn_less ynh_install_composer #================================================= # UPDATE A CONFIG FILE From 4fdbe3ad3670e92c166b840f4a0c18538ae78a1c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 24 Apr 2024 18:32:34 +0200 Subject: [PATCH 46/54] Get rid of stupid config panel only there to tweak the php fpm conf --- config_panel.toml | 30 --------------- scripts/config | 94 ----------------------------------------------- 2 files changed, 124 deletions(-) delete mode 100644 config_panel.toml delete mode 100644 scripts/config diff --git a/config_panel.toml b/config_panel.toml deleted file mode 100644 index a18d08a..0000000 --- a/config_panel.toml +++ /dev/null @@ -1,30 +0,0 @@ -version = "1.0" - -[main] -name = "Firefly-iii configuration" - - [main.php_fpm_config] - name = "PHP-FPM configuration" - - [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint" - type = "select" - choices.low = "Low, <= 20Mb per pool" - choices.medium = "Medium, between 20Mb and 40Mb per pool" - choices.high = "High, > 40Mb per pool" - choices.specific = "Use specific value" - default = "low" - - [main.php_fpm_config.fpm_free_footprint] - visible = "fpm_footprint == 'specific'" - ask = "Memory footprint of the service?" - type = "number" - default = "0" - help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." - - [main.php_fpm_config.fpm_usage] - ask = "Expected usage" - type = "select" - choices = ["low", "medium", "high"] - default = "low" - help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." diff --git a/scripts/config b/scripts/config deleted file mode 100644 index 17e90cc..0000000 --- a/scripts/config +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source _common.sh -source /usr/share/yunohost/helpers - -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) - -#================================================= -# SPECIFIC GETTERS FOR TOML SHORT KEY -#================================================= - -get__fpm_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - echo "specific" - else - echo "$current_fpm_footprint" - fi -} - -get__free_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - # If current_fpm_footprint is an integer, that's a numeric value for the footprint - echo "$current_fpm_footprint" - else - echo "0" - fi -} - -#================================================= -# SPECIFIC SETTERS FOR TOML SHORT KEYS -#================================================= - -set__fpm_footprint() { - if [ "$fpm_footprint" != "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" - fi -} - -set__fpm_free_footprint() { - if [ "$fpm_footprint" = "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" - fi -} - -#================================================= -# GENERIC FINALIZATION -#================================================= - -ynh_app_config_validate() { - _ynh_app_config_validate - - if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[fpm_free_footprint]}" == "true" ]; then - # If fpm_footprint is set to 'specific', use $fpm_free_footprint value. - if [ "$fpm_footprint" = "specific" ] - then - fpm_footprint=$fpm_free_footprint - fi - - if [ "$fpm_footprint" == "0" ] - then - ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." - - exit 0 - fi - fi -} - -ynh_app_config_apply() { - _ynh_app_config_apply - - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -} - -ynh_app_config_run $1 From e783276982ccaec3ff02d2b47e6891177341d645 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 25 Apr 2024 12:00:42 +0200 Subject: [PATCH 47/54] More tweaking to try to match the official doc.. --- scripts/install | 8 ++++---- scripts/upgrade | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scripts/install b/scripts/install index b552d5c..9464788 100755 --- a/scripts/install +++ b/scripts/install @@ -47,10 +47,10 @@ chown $app "$install_dir/.env" ynh_script_progression --message="Deploying..." 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:keys || true + php$phpversion artisan firefly-iii:upgrade-database + php$phpversion artisan firefly-iii:correct-database + php$phpversion artisan firefly-iii:report-integrity + php$phpversion artisan firefly-iii:laravel-passport-keys popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d862fa6..362c2c1 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ timezone="$(cat /etc/timezone)" ynh_script_progression --message="Upgrading source files..." -ynh_setup_source --dest_dir="$install_dir" --keep=".env storage/upload storage/export" +ynh_setup_source --dest_dir="$install_dir" --keep=".env storage" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -21,7 +21,7 @@ chmod -R 775 $install_dir/storage #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." +ynh_script_progression --message="Upgrading system configurations related to $app..." ynh_add_fpm_config @@ -34,25 +34,24 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= -# ynh_script_progression --message="Updating a configuration file..." +ynh_script_progression --message="Updating $app configuration..." -# ynh_add_config --template=".env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" -# chmod 400 "$install_dir/.env" -# chown $app "$install_dir/.env" +chmod 400 "$install_dir/.env" +chown $app "$install_dir/.env" #================================================= # DEPLOYMENT #================================================= -ynh_script_progression --message="Deploying..." +ynh_script_progression --message="Upgrading database..." pushd "$install_dir" - ynh_secure_remove --file="bootstrap/cache/*" php$phpversion artisan migrate --seed php$phpversion artisan firefly-iii:decrypt-all php$phpversion artisan cache:clear php$phpversion artisan firefly-iii:upgrade-database - php$phpversion artisan passport:keys || true + php$phpversion artisan firefly-iii:laravel-passport-keys php$phpversion artisan cache:clear popd From 0a6233269f5786d85117d3f7cca0b73adaacbfe1 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 25 Apr 2024 12:11:09 +0200 Subject: [PATCH 48/54] Hmkay, laravel-passport-keys doesn't exist for some reason, let's go bac to the old code... --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 9464788..a5bc312 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ 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 firefly-iii:laravel-passport-keys + php$phpversion artisan passport:keys || true popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 362c2c1..e4aaaef 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,7 +51,7 @@ pushd "$install_dir" php$phpversion artisan firefly-iii:decrypt-all php$phpversion artisan cache:clear php$phpversion artisan firefly-iii:upgrade-database - php$phpversion artisan firefly-iii:laravel-passport-keys + php$phpversion artisan passport:keys || true php$phpversion artisan cache:clear popd From a46fc36ef94325373d2dd5bf69e7f2c33cbe43f0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 25 Apr 2024 12:53:38 +0200 Subject: [PATCH 49/54] Make sure $language exists in upgrade script --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e4aaaef..6539026 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,6 +6,11 @@ source /usr/share/yunohost/helpers email=$(ynh_user_get_info --username=$admin --key=mail) timezone="$(cat /etc/timezone)" +if [ -z "${language:-}" ]; then + language="en_US" + ynh_app_setting_set --app=$app --key=language --value=$language +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From a33c6d875025f81fa77c4063fef5d8de185358c7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 25 Apr 2024 16:31:00 +0200 Subject: [PATCH 50/54] Let's try --full_replace=1 during upgrades --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6539026..33b454b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,7 @@ fi ynh_script_progression --message="Upgrading source files..." -ynh_setup_source --dest_dir="$install_dir" --keep=".env storage" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env storage" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 9aa75ad5777efca0ce6e5858ac7601a6095713b4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Apr 2024 15:11:21 +0000 Subject: [PATCH 51/54] Auto-update READMEs --- ALL_README.md | 7 +++++++ README.md | 26 ++++++++++++------------ README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++++--------------- README_gl.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 29 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index cf915be..46eed39 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Firefly III with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Firefly III quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Firefly III quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -21,7 +21,7 @@ Firefly III is a manager for your personal finances. It can help you keep track **Shipped version:** 6.1.11~ynh1 -**Demo:** https://demo.firefly-iii.org/login +**Demo:** ## Screenshots @@ -29,19 +29,19 @@ Firefly III is a manager for your personal finances. It can help you keep track ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug or sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..05677a2 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# Firefly III YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/firefly-iii.svg)](https://dash.yunohost.org/appci/app/firefly-iii) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/firefly-iii.maintain.svg) + +[![Instalatu Firefly III YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Firefly III YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +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. + + +**Paketatutako bertsioa:** 6.1.11~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Firefly III(r)en pantaila-argazkia](./doc/screenshots/imac-complete.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +edo +sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 063a018..6e70db6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Firefly III pour YunoHost @@ -9,18 +9,18 @@ It shall NOT be edited by hand. [![Installer Firefly III avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Firefly III rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Firefly III rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## 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'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.1.4~ynh1 +**Version incluse :** 6.1.11~ynh1 -**Démo :** https://demo.firefly-iii.org/login +**Démo :** ## Captures d’écran @@ -28,22 +28,22 @@ Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous a ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug ou sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..0570c6d --- /dev/null +++ b/README_gl.md @@ -0,0 +1,50 @@ + + +# Firefly III para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/firefly-iii.svg)](https://dash.yunohost.org/appci/app/firefly-iii) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/firefly-iii.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/firefly-iii.maintain.svg) + +[![Instalar Firefly III con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Firefly III de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +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. + + +**Versión proporcionada:** 6.1.11~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Firefly III](./doc/screenshots/imac-complete.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +ou +sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..12a3d48 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 的 Firefly III + +[![集成程度](https://dash.yunohost.org/integration/firefly-iii.svg)](https://dash.yunohost.org/appci/app/firefly-iii) ![工作状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/firefly-iii.maintain.svg) + +[![使用 YunoHost 安装 Firefly III](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=firefly-iii) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Firefly III。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +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. + + +**分发版本：** 6.1.11~ynh1 + +**演示：** + +## 截图 + +![Firefly III 的截图](./doc/screenshots/imac-complete.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +或 +sudo yunohost app upgrade firefly-iii -u https://github.com/YunoHost-Apps/firefly-iii_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 6cb9d85f416f8b9457faced730e9d602bd23bd2d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Thu, 25 Apr 2024 17:15:03 +0200 Subject: [PATCH 52/54] Update manifest.toml: simplify source options, fix autoupgrade --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index ed3e21a..80c69a1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,10 +57,9 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.11/FireflyIII-v6.1.11.zip" sha256 = "f6e3df061c9351daf8b70935e30b5ae6d8650efae27d1cc988e1c2a917d8de87" - extract = true in_subdir = false autoupdate.strategy = "latest_github_release" - autoupdate.asset = "zipball" + autoupdate.asset = ".*.zip" [resources.system_user] From a9a36f2b0d79b2eb77c6141cde55b3b15d930582 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 25 Apr 2024 17:16:08 +0200 Subject: [PATCH 53/54] Cleanup _common.sh --- scripts/_common.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1db13c2..05a7907 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,20 +1,2 @@ #!/bin/bash -#================================================= -# COMMON VARIABLES -#================================================= - -# Composer version -YNH_COMPOSER_VERSION="2.5.8" - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= From 56c2fc59746cdd986709a909dcfbbc810b8cb9da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Apr 2024 15:17:36 +0000 Subject: [PATCH 54/54] Auto-update READMEs --- ALL_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 05dd9c5..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,4 +4,4 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [阅读中文（简体）的 README](README_zh_Hans.md) \ No newline at end of file +- [阅读中文（简体）的 README](README_zh_Hans.md)