From 148c3089bf6b2003b5e32c8319a65cbeae65aa1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= <info@vitorgalvao.com>
Date: Fri, 15 Jul 2016 14:50:45 +0100
Subject: [PATCH] Travis: updated to match changes in main repo

---
 ci/travis/before_install.sh |  7 +++----
 ci/travis/before_script.sh  |  4 ----
 ci/travis/helpers.sh        | 10 ----------
 ci/travis/install.sh        |  4 ----
 ci/travis/script.sh         |  4 ----
 5 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index 881202f3b..dcf7beda2 100644
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -8,10 +8,11 @@
 # shellcheck disable=SC1090
 . "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh"
 
-enter_build_step
-
 header 'Running before_install.sh...'
 
+# https://github.com/rvm/rvm/pull/3627
+run rvm get head
+
 # unset rvm hook functions
 run unset -f cd gem
 
@@ -63,5 +64,3 @@ run mkdir -p "${CASK_TAP_DIR}"
 run rsync -az --delete "${TRAVIS_BUILD_DIR}/" "${CASK_TAP_DIR}/"
 run export TRAVIS_BUILD_DIR="${CASK_TAP_DIR}"
 run cd "${CASK_TAP_DIR}" || exit 1
-
-exit_build_step
diff --git a/ci/travis/before_script.sh b/ci/travis/before_script.sh
index 83c9c46b6..e84c1b049 100644
--- a/ci/travis/before_script.sh
+++ b/ci/travis/before_script.sh
@@ -8,8 +8,6 @@
 # shellcheck disable=SC1090
 . "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh"
 
-enter_build_step
-
 header 'Running before_script.sh...'
 
 run which bundle
@@ -17,5 +15,3 @@ run bundle --version
 
 run which rake
 run rake --version
-
-exit_build_step
diff --git a/ci/travis/helpers.sh b/ci/travis/helpers.sh
index 934ce3200..775287c20 100644
--- a/ci/travis/helpers.sh
+++ b/ci/travis/helpers.sh
@@ -32,16 +32,6 @@ header () {
   echo
 }
 
-# disallow unbound variables during build step
-enter_build_step () {
-  set -o nounset
-}
-
-# allow unbound variables so Travis doesn't get mad at us
-exit_build_step () {
-  set +o nounset
-}
-
 modified_cask_files () {
   if [[ -z "${MODIFIED_CASK_FILES+defined}" ]]; then
     MODIFIED_CASK_FILES="$(git diff --name-only --diff-filter=AM "${TRAVIS_COMMIT_RANGE}" -- Casks/*.rb)"
diff --git a/ci/travis/install.sh b/ci/travis/install.sh
index 0b08c6dfd..07404e5d4 100644
--- a/ci/travis/install.sh
+++ b/ci/travis/install.sh
@@ -8,8 +8,6 @@
 # shellcheck disable=SC1090
 . "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh"
 
-enter_build_step
-
 header 'Running install.sh...'
 
 # install bundler and project dependencies in $GEM_HOME
@@ -17,5 +15,3 @@ run gem install --no-ri --no-rdoc bundler
 run which bundle
 run bundle --version
 run bundle install --path="${GEM_HOME%/*/*}"
-
-exit_build_step
diff --git a/ci/travis/script.sh b/ci/travis/script.sh
index f86ad5784..92fbf9396 100644
--- a/ci/travis/script.sh
+++ b/ci/travis/script.sh
@@ -8,8 +8,6 @@
 # shellcheck disable=SC1090
 . "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh"
 
-enter_build_step
-
 header 'Running script.sh...'
 
 if any_casks_modified; then
@@ -18,5 +16,3 @@ if any_casks_modified; then
 fi
 
 run bundle exec rake test
-
-exit_build_step