[REF] install: Skip webkit installation if there is a issue (OCA#449)

* [REF] install: Skip webkit installation if there is a issue * [REF] install: Skip webkit installation if is not required a custom version
brain-tec · Oct 20, 2017 · 6117dcc · 6117dcc
1 parent c653409
commit 6117dcc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/travis/travis_install_nightly b/travis/travis_install_nightly
@@ -101,8 +101,10 @@ if [ "$clone_result" != "0"  ]; then
     exit $clone_result
 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)
+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:
 #