2
0
mirror of https://github.com/frappe/bench.git synced 2024-09-22 20:19:01 +00:00

wkhtmltox for trusty works ok on later versions of ubuntu

This commit is contained in:
Giovanni Lion 2015-11-09 16:15:22 +08:00
parent 4ff56f8dd7
commit ae63cb6f6c

View File

@ -237,9 +237,9 @@ install_wkhtmltopdf_centos () {
} }
install_wkhtmltopdf_deb () { install_wkhtmltopdf_deb () {
if [[ $OS_VER == "utopic" || $OS_VER == "vivid" ]]; then if [[ $OS_VER == "utopic" || $OS_VER == "vivid" || $OS_VER == "wily" ]]; then
echo "Cannot install wkhtmltodpdf. Skipping..." echo "Installing wkhtmltox package for trusty (Ubuntu 14.4) even if you are using $OS_VER."
return 0 WK_VER="trusty"
fi fi
if [[ $OS == "debian" && $OS_VER == "7" ]]; then if [[ $OS == "debian" && $OS_VER == "7" ]]; then
WK_VER="wheezy" WK_VER="wheezy"