# HG changeset patch
# User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr>
# Date 1466076205 -7200
#      Thu Jun 16 13:23:25 2016 +0200
# Node ID eed225b72979b93ab3cb336bd9f0e2de23719315
# Parent  25719b8f503b25819ccb54df304257790c747840
minor script fixes

diff --git a/VERSION b/VERSION
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-2.0
+2.1
diff --git a/do_tests b/do_tests
--- a/do_tests
+++ b/do_tests
@@ -13,7 +13,7 @@
 #
 # - access to pg database
 #
-# Version 2.0
+# Version 2.1
 here=$(dirname $0)
 project_home=$(cd $here && cd .. && echo $PWD)
 dbname=$(basename $project_home)_test
diff --git a/docker_build b/docker_build
--- a/docker_build
+++ b/docker_build
@@ -1,5 +1,5 @@
 #!/bin/zsh
-# template version 2.0
+# template version 2.1
 
 # TODO add a way to bypass the value, maybe with a key in the setup.cfg file
 repository=dockerhub.xcg.io
diff --git a/run_tests b/run_tests
--- a/run_tests
+++ b/run_tests
@@ -4,7 +4,7 @@
 # This script is used to run tests on a database with demo data installed.
 #
 # Either provide the name of the database (first argument) or it will default to <project>_test
-# Version 2.0
+# Version 2.1
 here=$(dirname $0)
 project_home=$(cd $here && cd .. && echo $PWD)
 tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())")
diff --git a/setup.cfg b/setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0
+current_version = 2.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)
 serialize = 
 	{major}.{minor}
diff --git a/start b/start
--- a/start
+++ b/start
@@ -5,7 +5,7 @@
 #
 # You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost)
 #
-# Version 2.0
+# Version 2.1
 here=$(dirname $0)
 project_home=$(cd $here && cd .. && echo $PWD)
 echo "Starting odoo for development"
@@ -53,7 +53,7 @@
 echo "Odoo version: $odoo_version"
 
 # odoo7, odoo8 or bzr
-ODOO_TYPE=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print c.get('odoo_scripts', 'odoo_type', 'odoo8')"
+ODOO_TYPE=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print c.get('odoo_scripts', 'odoo_type', 'odoo8')")
 
 args=$*
 if [ "$ODOO_TYPE" = "odoo8" ];
@@ -85,9 +85,9 @@
     else
 	if [ "$ODOO_TYPE" = "bzr" ];
 	then
-	    addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'odoo_type', 'addon_dirs').split()]))")"
+	    addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'addon_dirs', '').split()])))"
 	else
-	    addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'odoo_type', 'addon_dirs').split()]))")"
+	    addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'addon_dirs', '').split()]))")"
 	fi
     fi
 fi