From 4934d653092d1a415ba39a166975e6f01f64538b Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Mon, 23 Jun 2014 14:08:43 +0200 Subject: [PATCH] fix: [0k-openerp] update to use the new ``git-sub clone`` deployment tool. --- precise/0k-openerp/hooks/install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/precise/0k-openerp/hooks/install b/precise/0k-openerp/hooks/install index 88a7565..f2e408a 100755 --- a/precise/0k-openerp/hooks/install +++ b/precise/0k-openerp/hooks/install @@ -16,10 +16,10 @@ GIT_0K_BASE=${GIT_0K_BASE:-"git.0k.io:/var/git"} GIT_0K_CLONE_OPTIONS=${GIT_0K_CLONE_OPTIONS:-""} ## 0k git-sub setup options -GIT_0K_SUB_SETUP_OPTIONS=${GIT_0K_SUB_SETUP_OPTIONS:-""} +GIT_0K_SUB_CLONE_OPTIONS=${GIT_0K_SUB_CLONE_OPTIONS:-""} ## 0k git default checkout reference (for 0k-oe root package) -GIT_0K_CHECKOUT_REF=${GIT_0K_CHECKOUT_REF:-"7.0/0k/dev/master"} +GIT_0K_CHECKOUT_REF=${GIT_0K_CHECKOUT_REF:-"8.0/0k/dev/master"} release=$(lsb_release -c -s) @@ -74,7 +74,7 @@ pip install lxml genshi==0.6 pyparsing==1.5.7 psycopg2 pyyaml reportlab mako \ python-dateutil==1.5 cherrypy formencode==1.2.2 \ babel simplejson==2.0.9 python-openid mysql-python vatnumber \ mock unittest2 fudge docutils jinja2 gdata sact.epoch \ - shyaml + shyaml psutil ## Install pychart... from our repo as : ## download link in PyPi is dead, @@ -124,10 +124,8 @@ fi ( cd /opt/apps && - git clone $GIT_0K_CLONE_OPTIONS "$GIT_0K_BASE"/0k/0k-oe.git && - cd /opt/apps/0k-oe && - git checkout "$GIT_0K_CHECKOUT_REF" && - git sub setup $GIT_0K_SUB_SETUP_OPTIONS -r + git sub clone $GIT_0K_CLONE_OPTIONS $GIT_0K_SUB_CLONE_OPTIONS -b "$GIT_0K_CHECKOUT_REF" \ + "$GIT_0K_BASE"/0k/0k-oe ) adduser --system --home=/var/lib/openerp --group openerp