diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh index 5d128a1..c6bd1e1 100644 --- a/V9/odoo_install.sh +++ b/V9/odoo_install.sh @@ -76,11 +76,17 @@ sudo apt-get install python-gevent # Install Wkhtmltopdf if needed #-------------------------------------------------- if [ $INSTALL_WKHTMLTOPDF = "True" ]; then -echo -e "\n---- Install wkhtml and place on correct place for ODOO 8 ----" -sudo wget http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-amd64.deb -sudo dpkg -i wkhtmltox-0.12.1_linux-trusty-amd64.deb -sudo cp /usr/local/bin/wkhtmltopdf /usr/bin -sudo cp /usr/local/bin/wkhtmltoimage /usr/bin + echo -e "\n---- Install wkhtml and place shortcuts on correct place for ODOO 9 ----" + #pick up correct one from x64 & x32 versions: + if [ "`getconf LONG_BIT`" == "64" ];then + _url=$WKHTMLTOX_X64 + else + _url=$WKHTMLTOX_X32 + fi + sudo wget $_url + sudo gdebi --n `basename $_url` + sudo ln -s /usr/local/bin/wkhtmltopdf /usr/bin + sudo ln -s /usr/local/bin/wkhtmltoimage /usr/bin else echo "Wkhtmltopdf isn't installed due to the choice of the user!" fi