From d017ace0adb90ae9eb115c3cb69da4a9e99d8d1d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 May 2022 16:07:32 +0200 Subject: [PATCH 1/3] Manage swap --- scripts/install | 6 +++++- scripts/remove | 6 +++++- scripts/restore | 6 +++++- scripts/upgrade | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 5ea13b3..750e793 100644 --- a/scripts/install +++ b/scripts/install @@ -141,7 +141,11 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding swap..." -ynh_add_swap --size=$swap_needed +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + : +else + ynh_add_swap --size=$swap_needed +fi #================================================= # BUILD APP diff --git a/scripts/remove b/scripts/remove index 5cbf8c7..b67cd00 100644 --- a/scripts/remove +++ b/scripts/remove @@ -93,7 +93,11 @@ ynh_secure_remove --file="/var/log/$app.log" #================================================= ynh_script_progression --message="Removing swap..." -ynh_del_swap +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + : +else + ynh_del_swap +fi #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index aa44a01..a967402 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,7 +100,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Adding swap..." -ynh_add_swap --size=$swap_needed +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + : +else + ynh_add_swap --size=$swap_needed +fi #================================================= # BUILD APP diff --git a/scripts/upgrade b/scripts/upgrade index 63a586d..8fe393d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,7 +107,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Adding swap..." -ynh_add_swap --size=$swap_needed +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + : +else + ynh_add_swap --size=$swap_needed +fi #================================================= # BUILD APP From 95c40ad90e10b887e200425ab81862bdbe8ccc75 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 May 2022 14:07:37 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 20 ++++++++++---------- README_fr.md | 26 +++++++++++++++----------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4c3e9fb..ec9deb9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # LibreERP for YunoHost -[![Integration level](https://dash.yunohost.org/integration/libreerp.svg)](https://dash.yunohost.org/appci/app/libreerp) ![](https://ci-apps.yunohost.org/ci/badges/libreerp.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/libreerp.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/libreerp.svg)](https://dash.yunohost.org/appci/app/libreerp) ![Working status](https://ci-apps.yunohost.org/ci/badges/libreerp.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/libreerp.maintain.svg) [![Install LibreERP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreerp) *[Lire ce readme en français.](./README_fr.md)* @@ -25,7 +25,6 @@ LibreERP Apps can be used as stand-alone applications, but they also integrate s **Shipped version:** 12.0~ynh6 **Demo:** https://www.odoo.com/trial - ## Disclaimers / important information **WARNING**: LibreERP is a complex app. **DO NOT USE THIS PACKAGE** to run your business unless you know what you are doing!!! If you don't, you should consider to ask for help from a professionnal! @@ -47,22 +46,23 @@ LibreERP is forked from Odoo Community Edition. The name is change due to Odoo t ## Documentation and resources -* Official app website: https://odoo.com -* Official user documentation: https://www.odoo.com/documentation/15.0/applications.html -* Official admin documentation: https://www.odoo.com/documentation/15.0/administration.html -* Upstream app code repository: https://github.com/odoo/odoo -* YunoHost documentation for this app: https://yunohost.org/app_libreerp -* Report a bug: https://github.com/YunoHost-Apps/libreerp_ynh/issues +* Official app website: +* Official user documentation: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing --debug or sudo yunohost app upgrade libreerp -u https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index d10ec20..4fd3338 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # LibreERP pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/libreerp.svg)](https://dash.yunohost.org/appci/app/libreerp) ![](https://ci-apps.yunohost.org/ci/badges/libreerp.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/libreerp.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/libreerp.svg)](https://dash.yunohost.org/appci/app/libreerp) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/libreerp.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/libreerp.maintain.svg) [![Installer LibreERP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreerp) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer LibreERP 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.* @@ -21,7 +25,6 @@ LibreERP Apps can be used as stand-alone applications, but they also integrate s **Version incluse :** 12.0~ynh6 **Démo :** https://www.odoo.com/trial - ## Avertissements / informations importantes **WARNING**: LibreERP is a complex app. **DO NOT USE THIS PACKAGE** to run your business unless you know what you are doing!!! If you don't, you should consider to ask for help from a professionnal! @@ -43,22 +46,23 @@ LibreERP is forked from Odoo Community Edition. The name is change due to Odoo t ## Documentations et ressources -* Site officiel de l'app : https://odoo.com -* Documentation officielle utilisateur : https://www.odoo.com/documentation/15.0/applications.html -* Documentation officielle de l'admin : https://www.odoo.com/documentation/15.0/administration.html -* Dépôt de code officiel de l'app : https://github.com/odoo/odoo -* Documentation YunoHost pour cette app : https://yunohost.org/app_libreerp -* Signaler un bug : https://github.com/YunoHost-Apps/libreerp_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing --debug ou sudo yunohost app upgrade libreerp -u https://github.com/YunoHost-Apps/libreerp_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 07d976661e6954cf2a2f6443188b4e16e8dcf162 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 1 Jun 2022 23:17:58 +0200 Subject: [PATCH 3/3] Better ynh_add_swap --- check_process | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index ba1d0d3..c66d406 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ setup_public=1 upgrade=1 # 12.0-6 - upgrade=1 from_commit=2cfdbc229faa8700873e681a01f823c32475cca8 + # upgrade=1 from_commit=2cfdbc229faa8700873e681a01f823c32475cca8 backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/scripts/install b/scripts/install index 750e793..e37aba6 100644 --- a/scripts/install +++ b/scripts/install @@ -139,11 +139,11 @@ ynh_add_nginx_config #================================================= # ADD SWAP #================================================= -ynh_script_progression --message="Adding swap..." if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then : else + ynh_script_progression --message="Adding swap..." ynh_add_swap --size=$swap_needed fi diff --git a/scripts/remove b/scripts/remove index b67cd00..9eac726 100644 --- a/scripts/remove +++ b/scripts/remove @@ -91,11 +91,11 @@ ynh_secure_remove --file="/var/log/$app.log" #================================================= # REMOVE SWAP #================================================= -ynh_script_progression --message="Removing swap..." if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then : else + ynh_script_progression --message="Removing swap..." ynh_del_swap fi diff --git a/scripts/restore b/scripts/restore index a967402..2effee2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,11 +98,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # ADD SWAP #================================================= -ynh_script_progression --message="Adding swap..." if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then : else + ynh_script_progression --message="Adding swap..." ynh_add_swap --size=$swap_needed fi diff --git a/scripts/upgrade b/scripts/upgrade index 8fe393d..bd9ae58 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -105,11 +105,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # ADD SWAP #================================================= -ynh_script_progression --message="Adding swap..." if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then : else + ynh_script_progression --message="Adding swap..." ynh_add_swap --size=$swap_needed fi