From 5f59e487478113c122d022090845669dc5f4ce97 Mon Sep 17 00:00:00 2001
From: scith <scith@hotmail.fr>
Date: Mon, 14 Sep 2015 18:13:54 +0200
Subject: [PATCH] fix

---
 manifest.json   |  9 ---------
 scripts/backup  |  4 +---
 scripts/install | 11 ++++-------
 scripts/remove  |  8 +++++---
 scripts/restore |  4 +---
 scripts/upgrade |  4 ++++
 6 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/manifest.json b/manifest.json
index 433dcf6..cc760f0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,15 +19,6 @@
                     "fr": "Choisissez un domaine pour Odoo (Odoo sera installé dans sa racine !)"
                 },
                 "example": "odoo.domain.org"
-            },
-            {
-                "name": "is_public",
-                "ask": {
-                    "en": "Is it a public instance of Odoo? (Note: you can NOT run a public e-commerce website with Odoo in a private instance)",
-					"fr": "Est-ce une instance publique d'Odoo ? (Note : vous ne pouvez PAS utiliser Odoo comme site e-commerce dans une instance privée)"
-                },
-                "choices": ["Yes", "No"],
-                "default": "Yes"
             },
 			{
                 "name": "odoo_version",
diff --git a/scripts/backup b/scripts/backup
index 505d0ee..ccb3be1 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,5 +1,3 @@
 #! /bin/bash
-app=docker
-set -e
-
+app=odoo
 # TO BE DONE
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 7b3f03e..040dcd1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -4,9 +4,8 @@ set -e
 
 # Retrieve arguments
 domain=$1
-is_public=$2
-odoo_version=$3
-admin_password=$4
+odoo_version=$2
+admin_password=$3
 
 sudo yunohost app checkport 8069
 if [[ ! $? -eq 0 ]]; then
@@ -44,12 +43,10 @@ sudo yunohost app setting $app domain -v $domain
 		sudo yunohost service start odoo
 	
 # Configure Nginx and reload
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
+	sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-if [ "$is_public" = "Yes" ];
-then
+# Make Odoo public
 	sudo yunohost app setting $app skipped_uris -v "/"
-fi
 
 sudo service nginx reload
 echo $?
\ No newline at end of file
diff --git a/scripts/remove b/scripts/remove
index 471070b..197822f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,8 +1,10 @@
 #!/bin/bash
+app=odoo
 
-app=docker
-
-# TO BE DONE
+# Remove Odoo
+	sudo apt-get remove odoo
+	sudo apt-get remove wkhtmltopdf
+	sudo yunohost service remove odoo
 
 # Remove NGINX conf
 	domain=$(sudo yunohost app setting $app domain)
diff --git a/scripts/restore b/scripts/restore
index 9fb8b14..a47a836 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,5 +1,3 @@
 #!/bin/bash
-app=docker
-set -e
-
+app=odoo
 # TO BE DONE
\ No newline at end of file
diff --git a/scripts/upgrade b/scripts/upgrade
index 2938b36..4964284 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,3 +1,7 @@
 #!/bin/bash
+app=odoo
 
+# Upgrade official package
+	sudo apt-get install odoo -y -qq
+	
 # TBD