From 55288afa8fdcda5e46ad66f30185524cba291cfe Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 26 May 2015 19:07:34 -0500
Subject: [PATCH 1/4] Install the shpec file on CI

Rather than muck around with dotfiles, this allows us to use shpec the
way it was intended to be used.
---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9677fd..2765cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,17 +11,10 @@ matrix:
 script:
   - |
     $SHELL --version
-    if [ "$SHELL" = "zsh" ]; then
-      cat > $HOME/.zshenv <<END
-        disable -r end
-        setopt sh_word_split
-    END
-
-    fi
     if ${LINT:-false}; then
       shellcheck -s sh bin/shpec  # 'sh' refers to POSIX
     else
-      $SHELL bin/shpec
+      $SHELL -c shpec
     fi
 cache: apt
 before_install:
@@ -50,3 +43,10 @@ before_install:
     elif ! type $SHELL > /dev/null; then
       install_shell
     fi
+install:
+  - |
+    make install
+
+    if [ "$SHELL" = "zsh" ]; then
+      . shpec.plugin.zsh
+    fi

From 4949f84361eefacc4dba9104921251c302735ef9 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 26 May 2015 19:14:08 -0500
Subject: [PATCH 2/4] Style: consistent whitespace

Conform to existing project style.
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2765cbc..0989670 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,9 @@ before_install:
       done
       )
     }
-    install_shell(){
-      echo "Install $SHELL"
+
+    install_shell() {
+      echo "Installing $SHELL"
       sudo apt-get update -qq
       sudo apt-get install -y $SHELL
     }

From 9e8a5713ea441be06b7b1b59cfae540d1037ac2f Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 26 May 2015 19:48:14 -0500
Subject: [PATCH 3/4] Reorder Travis YAML file contents

Keys are declared roughly in their order of execution
---
 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0989670..cf19b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,6 @@ env:
     - SHELL=zsh
 matrix:
   fast_finish: true
-script:
-  - |
-    $SHELL --version
-    if ${LINT:-false}; then
-      shellcheck -s sh bin/shpec  # 'sh' refers to POSIX
-    else
-      $SHELL -c shpec
-    fi
 cache: apt
 before_install:
   - |
@@ -51,3 +43,11 @@ install:
     if [ "$SHELL" = "zsh" ]; then
       . shpec.plugin.zsh
     fi
+script:
+  - |
+    $SHELL --version
+    if ${LINT:-false}; then
+      shellcheck -s sh bin/shpec  # 'sh' refers to POSIX
+    else
+      $SHELL -c shpec
+    fi

From 42d79dab2553c6daed8a888ee86f77e4b34d837b Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 26 May 2015 19:54:22 -0500
Subject: [PATCH 4/4] Install shpec as root

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

diff --git a/.travis.yml b/.travis.yml
index cf19b22..4afd955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
     fi
 install:
   - |
-    make install
+    sudo make install
 
     if [ "$SHELL" = "zsh" ]; then
       . shpec.plugin.zsh