From 5f396629f73f9f6c0d392fede809725dec303743 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 4 Aug 2016 13:33:50 -0700
Subject: [PATCH] Use Ruby 2.2.1 explicitly on Travis CI OS X

---
 .travis.yml     | 1 +
 tools/travis.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1317cc82b..7e87b638c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,5 +24,6 @@ install:
   - git config --global url.git@github.com:.insteadOf https://github.com/
   - git submodule update --init
   - (cd tools && ./download.sh)
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm use 2.2.1; fi # Default 2.0.0 Ruby is buggy
 
 script: ./tools/travis.sh
diff --git a/tools/travis.sh b/tools/travis.sh
index 1fe98a03f..016e3787a 100755
--- a/tools/travis.sh
+++ b/tools/travis.sh
@@ -1,7 +1,7 @@
 set -x
 ulimit -n 4096
 # Only build packages for branches, not pull requests
-if [[ $TRAVIS_PULL_REQUEST == false ]]; then
+if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
     powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -CrossGen; Start-PSPackage; Start-PSPester; Start-PSxUnit"
 else
     powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -CrossGen; Start-PSPester; Start-PSxUnit"