From 4b831d58b704392a7242b599545e816cb452ad2e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 18 Dec 2018 08:14:21 -0800
Subject: [PATCH] Don't fiddle with default rust, humans don't like that

---
 ci/version-check-with-upgrade.sh | 1 -
 ci/version-check.sh              | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/version-check-with-upgrade.sh b/ci/version-check-with-upgrade.sh
index 7f6e11bb76..ef3ed29961 100755
--- a/ci/version-check-with-upgrade.sh
+++ b/ci/version-check-with-upgrade.sh
@@ -6,6 +6,5 @@ cd "$(dirname "$0")"
 channel=${1:-stable}
 if ! ./version-check.sh "$channel"; then
   rustup install "$channel"
-  rustup default "$channel"
   ./version-check.sh "$channel"
 fi
diff --git a/ci/version-check.sh b/ci/version-check.sh
index 9c9ef80ce3..21c58798d7 100755
--- a/ci/version-check.sh
+++ b/ci/version-check.sh
@@ -4,8 +4,9 @@ set -e
 require() {
   declare expectedProgram="$1"
   declare expectedVersion="$2"
+  shift 2
 
-  read -r program version _ < <($expectedProgram -V)
+  read -r program version _ < <($expectedProgram "$@" -V)
 
   declare ok=true
   [[ $program = "$expectedProgram" ]] || ok=false
@@ -20,8 +21,8 @@ require() {
 
 case ${1:-stable} in
 nightly)
-  require rustc 1.32.[0-9]+-nightly
-  require cargo 1.32.[0-9]+-nightly
+  require rustc 1.32.[0-9]+-nightly +nightly
+  require cargo 1.32.[0-9]+-nightly +nightly
   ;;
 stable)
   require rustc 1.31.[0-9]+