From 5ed2857310fed91c7e9bbeefbb0e4d9999ed392c Mon Sep 17 00:00:00 2001 From: Aravinth Date: Thu, 2 Nov 2017 16:03:56 +0800 Subject: [PATCH] Update odoo_install.sh --- odoo_install.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/odoo_install.sh b/odoo_install.sh index 1c9dab8..5cb6a3a 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -17,8 +17,8 @@ ##fixed parameters #odoo OE_USER="odoo" -OE_HOME="/$OE_USER" -OE_HOME_EXT="/$OE_USER/${OE_USER}-server" +OE_HOME="/home/$OE_USER" +OE_HOME_EXT="/${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" @@ -39,7 +39,6 @@ OE_CONFIG="${OE_USER}-server" ## in order to have correct version of wkhtmltox installed, for a danger note refer to ## https://www.odoo.com/documentation/8.0/setup/install.html#deb ): WKHTMLTOX_X64=https://downloads.wkhtmltopdf.org/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-amd64.deb -WKHTMLTOX_X32=https://downloads.wkhtmltopdf.org/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-i386.deb #-------------------------------------------------- # Update Server @@ -85,10 +84,7 @@ sudo apt-get install python-gevent -y if [ $INSTALL_WKHTMLTOPDF = "True" ]; then echo -e "\n---- Install wkhtml and place shortcuts on correct place for ODOO 11 ----" #pick up correct one from x64 & x32 versions: - if [ "`getconf LONG_BIT`" == "64" ];then - _url=$WKHTMLTOX_X64 - else - _url=$WKHTMLTOX_X32 + _url=$WKHTMLTOX_X64 fi sudo wget $_url sudo gdebi --n `basename $_url`