From 49fe4d213822a841113c441204b527ae0252353a Mon Sep 17 00:00:00 2001
From: Alex Lyon <arcterus@mail.com>
Date: Fri, 8 Jun 2018 15:14:43 -0700
Subject: [PATCH 1/2] Fix .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6985b4ef1..1981324b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ script:
   - if [ ! $REDOX ]; then cargo test $CARGO_ARGS --features "$FEATURES" --no-fail-fast; fi
   - mkdir installdir_test
   - DESTDIR=installdir_test make install
-  - [ `ls installdir_test/usr/bin | wc -l` -gt 0 ]
+  - "[ `ls installdir_test/usr/bin | wc -l` -gt 0 ]"
 
 addons:
   apt:

From 7a875f0787aa239ed4e18fe33eabd24a064f8da0 Mon Sep 17 00:00:00 2001
From: Alex Lyon <arcterus@mail.com>
Date: Fri, 8 Jun 2018 17:15:44 -0700
Subject: [PATCH 2/2] Install Sphinx on Travis

---
 .travis.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1981324b1..d55c91fbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,12 +37,21 @@ sudo: true
 before_install:
   - if [ $REDOX ]; then ./.travis/redox-toolchain.sh; fi
 
+install:
+  - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install python-pip && sudo pip install sphinx; fi
+  - |
+    if [ $TRAVIS_OS_NAME = osx ]; then
+      brew update
+      brew upgrade python
+      pip3 install sphinx
+    fi
+
 script:
   - cargo build $CARGO_ARGS --features "$FEATURES"
   - if [ ! $REDOX ]; then cargo test $CARGO_ARGS --features "$FEATURES" --no-fail-fast; fi
   - mkdir installdir_test
   - DESTDIR=installdir_test make install
-  - "[ `ls installdir_test/usr/bin | wc -l` -gt 0 ]"
+  - "[ `ls installdir_test/usr/local/bin | wc -l` -gt 0 ]"
 
 addons:
   apt: