From 16a858c487e6e3ed8ba273446248bce156ddbe2e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Jul 2022 06:13:42 +0000 Subject: [PATCH 1/6] Upgrade to v5.5.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index a5b9a9c..955244d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.4.12/invoiceninja.zip -SOURCE_SUM=0426a014d26b0aa6102c454412e04c04092b8ed8dc65c236a78b4ef5e9d1e577 +SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.5.2/invoiceninja.zip +SOURCE_SUM=64647f6960b64ac42633b65c6b8c108544e2dc845117d3c9f921792474df4ef9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index fdaa033..a03e68a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create and email invoices, track payments, expenses, and time tasks", "fr": "Créer et envoyer des factures par e-mail, suivre les paiements, les dépenses et les tâches horaires" }, - "version": "5.4.12~ynh1", + "version": "5.5.2~ynh1", "url": "https://invoiceninja.org", "upstream": { "license": "Elastic-2.0", From a226b9610f2c22015681134e283e5f301bc8619e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Jul 2022 06:13:45 +0000 Subject: [PATCH 2/6] 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 6e21ac2..f9d67d9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Create and email invoices, track payments, expenses, and time tasks -**Shipped version:** 5.4.12~ynh1 +**Shipped version:** 5.5.2~ynh1 **Demo:** https://app.invoiceninja.com/dashboard diff --git a/README_fr.md b/README_fr.md index 208a9cf..131a22a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Créer et envoyer des factures par e-mail, suivre les paiements, les dépenses et les tâches horaires -**Version incluse :** 5.4.12~ynh1 +**Version incluse :** 5.5.2~ynh1 **Démo :** https://app.invoiceninja.com/dashboard From 9899b25f6b74d684c3475bfc669e429010ca2b08 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Jul 2022 06:13:42 +0000 Subject: [PATCH 3/6] Upgrade to v5.5.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index a5b9a9c..955244d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.4.12/invoiceninja.zip -SOURCE_SUM=0426a014d26b0aa6102c454412e04c04092b8ed8dc65c236a78b4ef5e9d1e577 +SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.5.2/invoiceninja.zip +SOURCE_SUM=64647f6960b64ac42633b65c6b8c108544e2dc845117d3c9f921792474df4ef9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index fdaa033..a03e68a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create and email invoices, track payments, expenses, and time tasks", "fr": "Créer et envoyer des factures par e-mail, suivre les paiements, les dépenses et les tâches horaires" }, - "version": "5.4.12~ynh1", + "version": "5.5.2~ynh1", "url": "https://invoiceninja.org", "upstream": { "license": "Elastic-2.0", From e223f9aa1463833217e84b52d0c6aa0874ff9ec9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Jul 2022 06:13:45 +0000 Subject: [PATCH 4/6] 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 6e21ac2..f9d67d9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Create and email invoices, track payments, expenses, and time tasks -**Shipped version:** 5.4.12~ynh1 +**Shipped version:** 5.5.2~ynh1 **Demo:** https://app.invoiceninja.com/dashboard diff --git a/README_fr.md b/README_fr.md index 208a9cf..131a22a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Créer et envoyer des factures par e-mail, suivre les paiements, les dépenses et les tâches horaires -**Version incluse :** 5.4.12~ynh1 +**Version incluse :** 5.5.2~ynh1 **Démo :** https://app.invoiceninja.com/dashboard From 793cda03735da09368084b5300769689e470c302 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Tue, 26 Jul 2022 21:12:41 +0200 Subject: [PATCH 5/6] use correct php-var when upgrading --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4307400..50b56fb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) From 4c1d3398f50f08dec77f32507a6164469fabe0a8 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Tue, 26 Jul 2022 21:13:04 +0200 Subject: [PATCH 6/6] finally use ynh_secure_remove correctly --- scripts/upgrade | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 50b56fb..0d98727 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,9 +133,15 @@ ynh_script_progression --message="Upgrading the database..." pushd "$final_path" # Clear caches # https://github.com/invoiceninja/invoiceninja/issues/7397 - ynh_secure_remove --file=bootstrap/cache/* - ynh_secure_remove --file=storage/framework/cache/* - ynh_secure_remove --file=storage/framework/sessions/* + ynh_secure_remove --file=$final_path/bootstrap/cache/ + ynh_secure_remove --file=$final_path/storage/framework/cache/ + ynh_secure_remove --file=$final_path/storage/framework/sessions/ + + mkdir -p $final_path/bootstrap/cache/ $final_path/storage/framework/cache/ $final_path/storage/framework/sessions/ + + # clear cached stuff under /app/data/storage/framework (https://github.com/laravel/framework/issues/17377) + php$phpversion artisan view:clear + php$phpversion artisan cache:clear # Run the database migrations php$phpversion artisan migrate --force --no-interaction --verbose