Skip to content
Snippets Groups Projects
Commit 70d2f461f904 authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

do not set data dir if none provided

parent cc63d3ead1c8
No related branches found
No related tags found
No related merge requests found
2.11
2.12
......@@ -13,7 +13,7 @@
#
# - access to pg database
#
# Version 2.11
# Version 2.12
here=$(dirname $0)
project_home=$(cd $here && cd .. && echo $PWD)
......
......@@ -3,7 +3,7 @@
# Create docker script
# template version 2.11
# template version 2.12
# TODO add a way to bypass the value, maybe with a key in the setup.cfg file
here=$(dirname $0)
......
......@@ -5,7 +5,7 @@
#
# Either provide the name of the database (first argument) or it will default to <project>_test
# The DB user can be overriden by setting ODOO_SCRIPTS_DB_USER.
# Version 2.11
# Version 2.12
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())")
......
[bumpversion]
current_version = 2.11
current_version = 2.12
parse = (?P<major>\d+)\.(?P<minor>\d+)
serialize =
{major}.{minor}
......
......@@ -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.11
# Version 2.12
here=$(dirname $0)
project_home=$(cd $here && cd .. && echo $PWD)
python="/usr/bin/env python"
......@@ -79,17 +79,6 @@
#
args=$*
if [ "$ODOO_TYPE" = "odoo8" ];
then
if echo $args | grep -q -e "\( \|^\)--data-dir";
then
data_dir=""
else
data_dir=" --data-dir=$HOME/var/tmp"
fi
else
data_dir=""
fi
if echo $args | grep -q -e "\( \|^\)--db_host";
then
db_host=""
......@@ -127,5 +116,5 @@
#
echo "INFO - Version: $($odoo_bin --version)"
echo "DEBUG - command line is: $odoo_bin $config $db_host $data_dir $addons_path $args"
$odoo_bin $config $db_host $data_dir $addons_path $args
echo "DEBUG - command line is: $odoo_bin $config $db_host $addons_path $args"
$odoo_bin $config $db_host $addons_path $args
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment