From 211fdf2d3d934cd400137caea40b45425ce1dc42 Mon Sep 17 00:00:00 2001 From: shinjievil Date: Wed, 24 Jan 2018 21:21:56 -0500 Subject: [PATCH 1/3] Update and rename odoo_install.sh to odoo_install_shinji.sh --- odoo_install.sh => odoo_install_shinji.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) rename odoo_install.sh => odoo_install_shinji.sh (96%) diff --git a/odoo_install.sh b/odoo_install_shinji.sh similarity index 96% rename from odoo_install.sh rename to odoo_install_shinji.sh index 1c9dab8..c9c2389 100644 --- a/odoo_install.sh +++ b/odoo_install_shinji.sh @@ -92,6 +92,7 @@ if [ $INSTALL_WKHTMLTOPDF = "True" ]; then fi sudo wget $_url sudo gdebi --n `basename $_url` + sudo apt-get -f install sudo ln -s /usr/local/bin/wkhtmltopdf /usr/bin sudo ln -s /usr/local/bin/wkhtmltoimage /usr/bin else @@ -111,7 +112,7 @@ sudo chown $OE_USER:$OE_USER /var/log/$OE_USER # Install ODOO #-------------------------------------------------- echo -e "\n==== Installing ODOO Server ====" -sudo git clone --depth 1 --branch $OE_VERSION https://www.github.com/odoo/odoo $OE_HOME_EXT/ +sudo git clone --depth 1 --branch $OE_VERSION --single-branch https://www.github.com/odoo/odoo $OE_HOME_EXT/ if [ $IS_ENTERPRISE = "True" ]; then # Odoo Enterprise install! @@ -134,9 +135,12 @@ if [ $IS_ENTERPRISE = "True" ]; then echo -e "\n---- Added Enterprise code under $OE_HOME/enterprise/addons ----" echo -e "\n---- Installing Enterprise specific libraries ----" sudo pip3 install num2words ofxparse - sudo apt-get install nodejs npm - sudo npm install -g less - sudo npm install -g less-plugin-clean-css + sudo apt-get install curl + curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - + sudo apt-get install -y npm + sudo ln -s /usr/bin/nodejs /usr/bin/node + sudo npm install -g less less-plugin-clean-css + sudo apt-get install node-less fi echo -e "\n---- Create custom module directory ----" From 03175d1a8ca02fcb29c561d5134658f44f474511 Mon Sep 17 00:00:00 2001 From: shinjievil Date: Wed, 24 Jan 2018 22:39:11 -0500 Subject: [PATCH 2/3] Update odoo_install_shinji.sh --- odoo_install_shinji.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/odoo_install_shinji.sh b/odoo_install_shinji.sh index c9c2389..01c875f 100644 --- a/odoo_install_shinji.sh +++ b/odoo_install_shinji.sh @@ -75,6 +75,9 @@ echo -e "\n---- Install python libraries ----" sudo apt-get install python3-suds echo -e "\n--- Install other required packages" +sudo apt-get install curl -y +curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - +sudo apt-get install -y npm sudo apt-get install node-clean-css -y sudo apt-get install node-less -y sudo apt-get install python-gevent -y @@ -112,7 +115,7 @@ sudo chown $OE_USER:$OE_USER /var/log/$OE_USER # Install ODOO #-------------------------------------------------- echo -e "\n==== Installing ODOO Server ====" -sudo git clone --depth 1 --branch $OE_VERSION --single-branch https://www.github.com/odoo/odoo $OE_HOME_EXT/ +sudo git clone --depth 1 --branch $OE_VERSION https://www.github.com/odoo/odoo $OE_HOME_EXT/ if [ $IS_ENTERPRISE = "True" ]; then # Odoo Enterprise install! @@ -135,9 +138,6 @@ if [ $IS_ENTERPRISE = "True" ]; then echo -e "\n---- Added Enterprise code under $OE_HOME/enterprise/addons ----" echo -e "\n---- Installing Enterprise specific libraries ----" sudo pip3 install num2words ofxparse - sudo apt-get install curl - curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - - sudo apt-get install -y npm sudo ln -s /usr/bin/nodejs /usr/bin/node sudo npm install -g less less-plugin-clean-css sudo apt-get install node-less From a59ae82cc13ac6680f27d804cc5aa3cb3a9b21f9 Mon Sep 17 00:00:00 2001 From: shinjievil Date: Wed, 24 Jan 2018 22:59:07 -0500 Subject: [PATCH 3/3] Update odoo_install_shinji.sh --- odoo_install_shinji.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/odoo_install_shinji.sh b/odoo_install_shinji.sh index 01c875f..c444982 100644 --- a/odoo_install_shinji.sh +++ b/odoo_install_shinji.sh @@ -21,7 +21,7 @@ OE_HOME="/$OE_USER" OE_HOME_EXT="/$OE_USER/${OE_USER}-server" #The default port where this Odoo instance will run under (provided you use the command -c in the terminal) #Set to true if you want to install it, false if you don't need it or have it already installed. -INSTALL_WKHTMLTOPDF="True" +INSTALL_WKHTMLTOPDF="False" #Set the default Odoo port (you still have to use -c /etc/odoo-server.conf for example to use this.) OE_PORT="8069" #Choose the Odoo version which you want to install. For example: 11.0, 10.0, 9.0 or saas-18. When using 'master' the master version will be installed. @@ -138,9 +138,9 @@ if [ $IS_ENTERPRISE = "True" ]; then echo -e "\n---- Added Enterprise code under $OE_HOME/enterprise/addons ----" echo -e "\n---- Installing Enterprise specific libraries ----" sudo pip3 install num2words ofxparse - sudo ln -s /usr/bin/nodejs /usr/bin/node - sudo npm install -g less less-plugin-clean-css - sudo apt-get install node-less + sudo apt-get install nodejs npm + sudo npm install -g less + sudo npm install -g less-plugin-clean-css fi echo -e "\n---- Create custom module directory ----"