diff --git a/docker/Dockerfile b/docker/Dockerfile index b923147..5fe10c7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -33,8 +33,8 @@ RUN apt-get update \ git \ iproute2 \ inetutils-ping \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ - && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb \ + && echo 'd9f259a67e05e1c221d48b504453645e6c491fab wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb diff --git a/script/install_OSX_dependency.sh b/script/install_OSX_dependency.sh index 9806cc1..3866f97 100755 --- a/script/install_OSX_dependency.sh +++ b/script/install_OSX_dependency.sh @@ -47,8 +47,8 @@ curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poet # Install Wkhtmltopdf if needed #-------------------------------------------------- echo "\n---- Installing Wkhtmltopdf if needed ----" -if [ ! -f "wkhtmltox-0.12.5-1.macos-carbon.pkg" ]; then - sudo wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.macos-carbon.pkg - sudo sudo installer -pkg wkhtmltox-0.12.5-1.macos-carbon.pkg -target / +if [ ! -f "wkhtmltox-0.12.6-1.macos-cocoa.pkg" ]; then + sudo wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.macos-cocoa.pkg + sudo sudo installer -pkg wkhtmltox-0.12.6-1.macos-cocoa.pkg -target / else echo "Wkhtmltopdf already installed" fi diff --git a/script/install_debian_dependency.sh b/script/install_debian_dependency.sh index 90e628f..373dda7 100755 --- a/script/install_debian_dependency.sh +++ b/script/install_debian_dependency.sh @@ -7,11 +7,18 @@ EL_USER=${USER} ## ### WKHTMLTOPDF download links -## === Ubuntu Trusty x64 & x32 === (for other distributions please replace these two links, +## === Ubuntu Focal x64 === (for other distributions please replace these two links, ## in order to have correct version of wkhtmltopdf installed, for a danger note refer to ## https://github.com/odoo/odoo/wiki/Wkhtmltopdf ): -WKHTMLTOX_X64=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.trusty_amd64.deb -WKHTMLTOX_X32=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.trusty_i386.deb +# Ubuntu 20.04 +UBUNTU_VERSION=$(lsb_release -rs) +if [ "20.04" == "${UBUNTU_VERSION}" ]; then + WKHTMLTOX_X64=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb +elif [ "18.04" == "${UBUNTU_VERSION}" ]; then + WKHTMLTOX_X64=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb +else + WKHTMLTOX_X64=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb +fi #-------------------------------------------------- # Update Server @@ -63,12 +70,7 @@ if [ ${EL_INSTALL_WKHTMLTOPDF} = "True" ]; then INSTALLED=$(dpkg -s wkhtmltox|grep installed) if [ "" == "${INSTALLED}" ]; then echo -e "\n---- Install wkhtml and place shortcuts on correct place ----" - #pick up correct one from x64 & x32 versions: - if [ "`getconf LONG_BIT`" == "64" ];then - _url=${WKHTMLTOX_X64} - else - _url=${WKHTMLTOX_X32} - fi + _url=${WKHTMLTOX_X64} sudo wget ${_url} sudo gdebi --n `basename ${_url}` sudo ln -s /usr/local/bin/wkhtmltopdf /usr/bin