From a1a238ac36b3de6b57e8b3b144259854e644334a Mon Sep 17 00:00:00 2001
From: ljf <ljf@grimaud.me>
Date: Wed, 14 Dec 2016 12:02:22 +0100
Subject: [PATCH] [enh] Add odoo 10.0

---
 manifest.json   |  4 ++--
 scripts/install | 10 ++++------
 scripts/remove  |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 210b9d4..1b848cd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,8 +36,8 @@
                     "en": "Which version of Odoo do you want to install?",
 					"fr": "Quelle version d'Odoo souhaitez-vous installer ?"
                 },
-                "choices": ["8.0", "9.0"],
-                "default": "8.0"
+                "choices": ["8.0", "9.0", "10.0"],
+                "default": "9.0"
             },
 			{
                 "name": "admin_password",
diff --git a/scripts/install b/scripts/install
index dfdd267..5a4462c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -55,15 +55,13 @@ else
 
   	# Install Odoo
   	sudo curl -sS https://nightly.odoo.com/odoo.key | sudo apt-key add -
-  	if [ "$odoo_version" = "8.0" ]; then
-  		sudo sh -c 'echo "deb http://nightly.odoo.com/8.0/nightly/deb/ ./" > /etc/apt/sources.list.d/odoo.list'
-  	else
-  		sudo sh -c 'echo "deb http://nightly.odoo.com/9.0/nightly/deb/ ./" > /etc/apt/sources.list.d/odoo.list'
-  	fi
+  	sudo sh -c "echo 'deb http://nightly.odoo.com/${odoo_version}/nightly/deb/ ./' > /etc/apt/sources.list.d/odoo.list"
   	sudo apt-get update
 
   	# Initialize installation
-    ynh_package_install postgresql odoo
+    ynh_package_install postgresql
+
+    ynh_package_install odoo
 
     # Install wkhtmltopdf to print PDF reports
     ynh_package_install xfonts-75dpi xfonts-base wkhtmltopdf
diff --git a/scripts/remove b/scripts/remove
index 372e756..9e81e5a 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -34,7 +34,7 @@ if [ "$instance" = "slave" ]; then
 		sudo yunohost service start odoo | true
 fi
 # Remove NGINX conf
-sudo rm /etc/nginx/conf.d/$domain.d/$app.conf
+sudo rm /etc/nginx/conf.d/$domain.d/$app.conf | true
 
 # Reload
 sudo service nginx reload