diff --git a/manifest.json b/manifest.json index 1b848cd..6861a15 100644 --- a/manifest.json +++ b/manifest.json @@ -1,61 +1,64 @@ { - "name": "Odoo", - "id": "odoo", - "packaging_format": 1, - "description": { - "en": "Odoo is a suite of business apps (ERP: CRM, Accounting, Point of Sale, HR, Purchases...).", - "fr": "Odoo est une collection d'apps de gestion d'entreprise (ERP : CRM, Comptabilité, Point de Vente, RH, Achats, ...)." - }, - "maintainer": { - "name": "scith, ljf", - "email": "ljf+yunohost@grimaud.me" - }, - "url":"https://www.odoo.com", - "license":"free", - "requirements": { - "yunohost": ">= 2.4.0" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain for Odoo (Odoo will be installed on its root!)", - "fr": "Choisissez un domaine pour Odoo (Odoo sera installé dans sa racine !)" - }, - "example": "odoo.domain.org" - }, - { - "name": "odoo_version", - "ask": { - "en": "Which version of Odoo do you want to install?", - "fr": "Quelle version d'Odoo souhaitez-vous installer ?" - }, - "choices": ["8.0", "9.0", "10.0"], - "default": "9.0" - }, - { - "name": "admin_password", - "type": "password", - "ask": { - "en": "Choose a strong master admin password", - "fr": "Choisissez un mot de passe maître fort pour l'administration" - } - }, - { - "name": "lang", - "ask": { - "en": "Choose a language for Odoo", - "fr": "Choisissez une langue pour Odoo" - }, - "choices": ["en_US", "fr_FR", "de_DE"], - "default": "en_US" - } - ] - } + "name": "Odoo", + "id": "odoo", + "packaging_format": 1, + "description": { + "en": "Odoo is a suite of business apps (ERP: CRM, Accounting, Point of Sale, HR, Purchases...).", + "fr": "Odoo est une collection d'apps de gestion d'entreprise (ERP : CRM, Comptabilité, Point de Vente, RH, Achats, ...)." + }, + "maintainer": { + "name": "scith, ljf", + "email": "ljf+yunohost@grimaud.me" + }, + "url": "https://www.odoo.com", + "license": "free", + "requirements": { + "yunohost": ">= 2.4.0" + }, + "multi_instance": true, + "services": [ + "nginx" + ], + "arguments": { + "install": [{ + "name": "domain", + "type": "domain", + "ask": { + "en": "Choose a domain for Odoo (Odoo will be installed on its root!)", + "fr": "Choisissez un domaine pour Odoo (Odoo sera installé dans sa racine !)" + }, + "example": "odoo.domain.org" + }, { + "name": "version", + "ask": { + "en": "Which version of Odoo do you want to install?", + "fr": "Quelle version d'Odoo souhaitez-vous installer ?" + }, + "choices": ["8.0", "9.0", "10.0"], + "default": "9.0" + }, { + "name": "oca", + "type": "boolean", + "ask": { + "en": "Use OCA repository to get community bugfixes ?", + "fr": "Utiliser les dépots OCA pour bénéficier des bugfix communautaires ?" + }, + "default": false + }, { + "name": "admin_password", + "type": "password", + "ask": { + "en": "Choose a strong master admin password", + "fr": "Choisissez un mot de passe maître fort pour l'administration" + } + }, { + "name": "lang", + "ask": { + "en": "Choose a language for Odoo", + "fr": "Choisissez une langue pour Odoo" + }, + "choices": ["en_US", "fr_FR", "de_DE"], + "default": "en_US" + }] + } } diff --git a/scripts/install b/scripts/install index 5a4462c..ebfd181 100644 --- a/scripts/install +++ b/scripts/install @@ -6,7 +6,8 @@ app=$YNH_APP_INSTANCE_NAME # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN -odoo_version=$YNH_APP_ARG_ODOO_VERSION +version=$YNH_APP_ARG_VERSION +oca=$YNH_APP_ARG_OCA admin_password=$YNH_APP_ARG_ADMIN_PASSWORD lang=$YNH_APP_ARG_LANG @@ -46,7 +47,7 @@ else echo "Installing odoo" - ynh_app_setting_set "$app" version "$odoo_version" + ynh_app_setting_set "$app" version "$version" ynh_app_setting_set "$app" instance "master" # Install Odoo @@ -55,7 +56,7 @@ else # Install Odoo sudo curl -sS https://nightly.odoo.com/odoo.key | sudo apt-key add - - sudo sh -c "echo 'deb http://nightly.odoo.com/${odoo_version}/nightly/deb/ ./' > /etc/apt/sources.list.d/odoo.list" + sudo sh -c "echo 'deb http://nightly.odoo.com/${version}/nightly/deb/ ./' > /etc/apt/sources.list.d/odoo.list" sudo apt-get update # Initialize installation