From 2f999b9bde4b64271fb42e9caa30474451c4098d Mon Sep 17 00:00:00 2001
From: Matt Lenc <mattl@incuna.com>
Date: Wed, 18 Jun 2014 16:00:30 +0100
Subject: Move pwd to before_install section

C'mon Travis!
---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e4f8d64..352b7c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,6 @@ python:
   - "3.3"
   - "3.4"
 env:
-  global:
-    - WKHTML_HOME=`pwd`/"_wkhtmltopdf"
   - DJANGO=Django==1.4.13
   - DJANGO=Django==1.5.8
   - DJANGO=Django==1.6.5
@@ -17,14 +15,15 @@ matrix:
     - python: "3.4"
       env: DJANGO=Django==1.4.13
 before_install:
+  - PWD=`pwd`
   - "echo '## Installing dependencies'"
   - "sudo apt-get install -y openssl build-essential xorg libssl-dev"
   - "echo '## Downloading wkhtmltopdf 0.12.0'"
   - "wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.0/wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz"
-  - "mkdir -p $WKHTML_HOME"
-  - "echo '## Extracting wkhtmltox into $WKHTML_HOME'"
-  - "tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $WKHTML_HOME"
-  - "export WKHTMLTOPDF_CMD=$WKHTML_HOME/wkhtmltox/bin/wkhtmltopdf"
+  - "mkdir -p $PWD"
+  - "echo '## Extracting wkhtmltox into $PWD'"
+  - "tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $PWD"
+  - "export WKHTMLTOPDF_CMD=$PWD/wkhtmltox/bin/wkhtmltopdf"
 install:
   - pip install $DJANGO
   - pip install -r test_requirements.txt
-- 
cgit v1.2.3