From b02f4a2b5bac35c698f10c7c9d26fe381b83eaaa Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Sun, 8 Mar 2020 10:45:18 +0100 Subject: [PATCH 1/7] Backup file added by error --- scripts/ynh_composer~ | 64 ------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 scripts/ynh_composer~ diff --git a/scripts/ynh_composer~ b/scripts/ynh_composer~ deleted file mode 100644 index 218dae2..0000000 --- a/scripts/ynh_composer~ +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES -#================================================= - -# Package dependencies -pkg_dependencies="php-cli php-common php-intl php-json php-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-net-ldap2 php-net-ldap3 php-zip php-gd php-mbstring php-curl" - -# Plugins version -contextmenu_version=2.3 -automatic_addressbook_version=v0.4.3 -carddav_version=3.0.3 - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -# Execute a command with Composer -# -# usage: ynh_composer_exec --phpversion=phpversion [--workdir=$final_path] --commands="commands" -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# | arg: -c, --commands - Commands to execute. -ynh_composer_exec () { - # Declare an array to define the options of this helper. - local legacy_args=vwc - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) - local phpversion - local workdir - local commands - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-7.0}" - - COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} "$workdir/composer.phar" $commands \ - -d "$workdir" --quiet --no-interaction -} - -# Install and initialize Composer in the given directory -# -# usage: ynh_install_composer --phpversion=phpversion [--workdir=$final_path] -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -ynh_install_composer () { - # Declare an array to define the options of this helper. - local legacy_args=vw - declare -Ar args_array=( [v]=phpversion= [w]=workdir= ) - local phpversion - local workdir - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-7.0}" - - curl -sS https://getcomposer.org/installer \ - | COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} -- --quiet --install-dir="$workdir" \ - || ynh_die "Unable to install Composer." - - # update dependencies to create composer.lock - ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev" \ - || ynh_die "Unable to update core dependencies with Composer." -} From 4ec78d1aae9df5ce24967de8692e5589cbdacf57 Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Sun, 8 Mar 2020 10:48:24 +0100 Subject: [PATCH 2/7] Change php version for conf backup --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 4b08dcd..69c295a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -51,7 +51,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Backing up php-fpm configuration..." --time --weight=1 -ynh_backup --src_path="/etc/php/7.2/fpm/pool.d/$app.conf" +ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE From ff14f259873a29bfb6304cae82deeac76342b0cf Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Tue, 10 Mar 2020 21:16:31 +0100 Subject: [PATCH 3/7] Update version --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 238ce9d..50df31d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/5.0.5.tar.gz -SOURCE_SUM=bb3c6ecbbc680c6ebbaab7439819a8c61a22b7911d21860c0d217bed655750c0 +SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/5.1.0.tar.gz +SOURCE_SUM=3e20da603780f218fbd0b1354ad975fb2f7af37b216a015b1c3a4a1783a06233 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=firefly-iii-5.0.5.tar.gz +SOURCE_FILENAME=firefly-iii-5.1.0.tar.gz From f6ad1fe87018b2949dd2720f702cbcc256861cb8 Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Tue, 10 Mar 2020 21:19:25 +0100 Subject: [PATCH 4/7] Update version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1de78c2..1a98f32 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

-# Firefly III v5.0.5 for YunoHost +# Firefly III v5.1.0 for YunoHost [![Integration level](https://dash.yunohost.org/integration/Firefly-III.svg)](https://ci-apps.yunohost.org/jenkins/job/firefly-iii%20%28Community%29/lastBuild/consoleFull) From 0e11d861c417b7aab1aa6796fd0e090fb5bc16d0 Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Tue, 10 Mar 2020 21:24:25 +0100 Subject: [PATCH 5/7] Update version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a6d6409..c7f61f1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Firefly III is a self-hosted financial manager.", "fr": "Firefly III est un gestionnaire de finances personnelles." }, - "version": "5.0.5", + "version": "5.1.0", "url": "https://firefly-iii.org/", "license": "GPL v3", "maintainer": { From 4cd1db38d1a073363fa0a584597057b48667a608 Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Tue, 10 Mar 2020 22:34:02 +0100 Subject: [PATCH 6/7] Update pakage version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c7f61f1..595182e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Firefly III is a self-hosted financial manager.", "fr": "Firefly III est un gestionnaire de finances personnelles." }, - "version": "5.1.0", + "version": "5.1.0~ynh1", "url": "https://firefly-iii.org/", "license": "GPL v3", "maintainer": { From 057bb96b9a54b6f0949bcd18d795d9130536bdba Mon Sep 17 00:00:00 2001 From: dr41nU <50152843+dr41nU@users.noreply.github.com> Date: Thu, 12 Mar 2020 21:56:25 +0100 Subject: [PATCH 7/7] Revert package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 595182e..c7f61f1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Firefly III is a self-hosted financial manager.", "fr": "Firefly III est un gestionnaire de finances personnelles." }, - "version": "5.1.0~ynh1", + "version": "5.1.0", "url": "https://firefly-iii.org/", "license": "GPL v3", "maintainer": {