From 14c82a20a69e051b39793a8711f9ca727b9fb418 Mon Sep 17 00:00:00 2001 From: Yenthe Date: Fri, 25 Sep 2015 09:15:20 +0200 Subject: [PATCH] Revert "Added Wkhtml x64/x32" This reverts commit ef91a3da3dcad5771a89789713cde30ed51c09b0. --- V9/odoo_install.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh index c6bd1e1..5d128a1 100644 --- a/V9/odoo_install.sh +++ b/V9/odoo_install.sh @@ -76,17 +76,11 @@ sudo apt-get install python-gevent # Install Wkhtmltopdf if needed #-------------------------------------------------- if [ $INSTALL_WKHTMLTOPDF = "True" ]; then - 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 +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 else echo "Wkhtmltopdf isn't installed due to the choice of the user!" fi