From c670f8342355313f98d5408b2dc0889369f9c4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20L=C3=B3pez?= Date: Fri, 16 Jun 2017 08:16:27 -0500 Subject: [PATCH 1/2] [REF] install: Skip webkit installation if there is a issue --- travis/travis_install_nightly | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/travis/travis_install_nightly b/travis/travis_install_nightly index 8f66acd5a..d192c5e48 100755 --- a/travis/travis_install_nightly +++ b/travis/travis_install_nightly @@ -83,7 +83,10 @@ if [ "$clone_result" != "0" ]; then fi; echo "Install webkit (wkhtmltopdf) patched" -(cd ${HOME}/maintainer-quality-tools/travis/ && wget -qO- https://downloads.wkhtmltopdf.org/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz | tar -xJ --strip-components=2 wkhtmltox/bin/wkhtmltopdf) +(cd ${HOME}/maintainer-quality-tools/travis/ && wget -qO- -t 1 --timeout=240 https://downloads.wkhtmltopdf.org/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz | tar -xJ --strip-components=2 wkhtmltox/bin/wkhtmltopdf) +if [ "$?" != "0" ]; then + echo "Warning: Webkit patched was not downloaded." +fi; # Expected directory structure: # From 88b7d6cc97c398b4e3c0dfc4ce963b8f08705233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20L=C3=B3pez?= Date: Fri, 16 Jun 2017 09:06:50 -0500 Subject: [PATCH 2/2] [REF] install: Skip webkit installation if is not required a custom version --- travis/travis_install_nightly | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/travis/travis_install_nightly b/travis/travis_install_nightly index d192c5e48..0a52c0428 100755 --- a/travis/travis_install_nightly +++ b/travis/travis_install_nightly @@ -82,10 +82,9 @@ if [ "$clone_result" != "0" ]; then exit $clone_result fi; -echo "Install webkit (wkhtmltopdf) patched" -(cd ${HOME}/maintainer-quality-tools/travis/ && wget -qO- -t 1 --timeout=240 https://downloads.wkhtmltopdf.org/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz | tar -xJ --strip-components=2 wkhtmltox/bin/wkhtmltopdf) -if [ "$?" != "0" ]; then - echo "Warning: Webkit patched was not downloaded." +if [ "${WKHTMLTOPDF_VERSION}" != "" ]; then + echo "Install webkit (wkhtmltopdf) patched version ${WKHTMLTOPDF_VERSION}" + (cd ${HOME}/maintainer-quality-tools/travis/ && wget -qO- -t 1 --timeout=240 https://downloads.wkhtmltopdf.org/0.12/${WKHTMLTOPDF_VERSION}/wkhtmltox-${WKHTMLTOPDF_VERSION}_linux-generic-amd64.tar.xz | tar -xJ --strip-components=2 wkhtmltox/bin/wkhtmltopdf) fi; # Expected directory structure: