From e968df3e39cbf832ec564f0ea6780613f1561603 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 9 Jun 2017 15:28:04 +0530 Subject: [PATCH] [hotfix] get wkhtmltopdf from frappe/wkhtmltopdf repo, setup npm dependencies in bench init (#428) --- bench/utils.py | 4 ++-- playbooks/develop/includes/wkhtmltopdf.yml | 4 ++-- vm/ansible/roles/wkhtmltopdf/tasks/main.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bench/utils.py b/bench/utils.py index 50040f33..cd51a47e 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -137,8 +137,8 @@ def setup_env(bench_path='.'): exec_cmd('./env/bin/pip -q install -e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit', cwd=bench_path) def setup_socketio(bench_path='.'): - exec_cmd("npm install socket.io redis express superagent cookie", cwd=bench_path) - + exec_cmd("npm install socket.io redis express superagent cookie babel-core less chokidar \ + babel-cli babel-preset-es2015 babel-preset-es2016 babel-preset-es2017 babel-preset-babili", cwd=bench_path) def new_site(site, mariadb_root_password=None, admin_password=None, bench_path='.'): """ diff --git a/playbooks/develop/includes/wkhtmltopdf.yml b/playbooks/develop/includes/wkhtmltopdf.yml index 7929d3c0..ea4c0c28 100644 --- a/playbooks/develop/includes/wkhtmltopdf.yml +++ b/playbooks/develop/includes/wkhtmltopdf.yml @@ -1,7 +1,7 @@ --- - name: download wkthmltox linux - get_url: url=http://downloads.wkhtmltopdf.org/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-{{ "amd64" if ansible_architecture == "x86_64" else "i386"}}.tar.xz dest=/tmp/wkhtmltox.tar.xz - + get_url: url=https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-{{ "amd64" if ansible_architecture == "x86_64" else "i386"}}.tar.xz dest=/tmp/wkhtmltox.tar.xz + - name: Creates directory file: path=/tmp/wkhtmltox state=directory diff --git a/vm/ansible/roles/wkhtmltopdf/tasks/main.yml b/vm/ansible/roles/wkhtmltopdf/tasks/main.yml index fbd0c775..52c95925 100644 --- a/vm/ansible/roles/wkhtmltopdf/tasks/main.yml +++ b/vm/ansible/roles/wkhtmltopdf/tasks/main.yml @@ -18,7 +18,7 @@ when: ansible_os_family == 'Debian' - name: download wkthmltox linux - get_url: url=http://download.gna.org/wkhtmltopdf/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-{{ "amd64" if ansible_architecture == "x86_64" else "i386"}}.tar.xz dest=/tmp/wkhtmltox.tar.xz + get_url: url=https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-{{ "amd64" if ansible_architecture == "x86_64" else "i386"}}.tar.xz dest=/tmp/wkhtmltox.tar.xz - name: unarchive wkhtmltopdf unarchive: src=/tmp/wkhtmltox.tar.xz dest=/tmp/wkhtmltox