From 97f30505e11de9303d9c67846904e1d54b961372 Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Thu, 22 Dec 2016 04:10:52 -0800
Subject: [PATCH] While the cache is empty, let's switch to using
 download_cmake.sh

---
 .travis.yml               | 7 ++-----
 contrib/download_cmake.sh | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d878f4a997f0c..04e5a164242914 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - kalakris-cmake
           packages:
-            - cmake
             - bar
             - time
             - binutils
@@ -30,9 +28,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - kalakris-cmake
           packages:
-            - cmake
             - bar
             - time
             - g++-5
@@ -82,7 +78,7 @@ before_install:
         contrib/travis_fastfail.sh || exit 1;
         brew tap staticfloat/julia;
         brew rm --force $(brew deps --HEAD julia);
-        brew install -v cmake staticfloat/juliadeps/libgfortran;
+        brew install -v staticfloat/juliadeps/libgfortran;
         brew install -v --only-dependencies --HEAD julia;
         BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm37-julia)/bin/llvm-config-3.7 LLVM_SIZE=$(brew --prefix llvm37-julia)/bin/llvm-size-3.7";
         BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
@@ -100,6 +96,7 @@ before_install:
     - git clone -q git://git.kitenet.net/moreutils
 script:
     - echo $BUILDOPTS
+    - contrib/download_cmake.sh
     - make -C moreutils mispipe
     - make $BUILDOPTS -C base version_git.jl.phony
     # capture the log, but only print it if `make deps` fails
diff --git a/contrib/download_cmake.sh b/contrib/download_cmake.sh
index 196dcac7c8e949..73105af6fb83e1 100755
--- a/contrib/download_cmake.sh
+++ b/contrib/download_cmake.sh
@@ -24,11 +24,11 @@ FULLNAME=cmake-$CMAKE_VERSION-$PLATFORM
 case $PLATFORM in
   Darwin-x86_64)
     ../tools/jldownload https://cmake.org/files/v$CMAKE_VERSION_MAJMIN/$FULLNAME.tar.gz
-    echo "$CMAKE_SHA256_DARWIN $FULLNAME.tar.gz" | shasum -a 256 -c -
+    echo "$CMAKE_SHA256_DARWIN  $FULLNAME.tar.gz" | shasum -a 256 -c -
     CMAKE_EXTRACTED_PATH=$FULLNAME/CMake.app/Contents/bin/cmake;;
   Linux-x86_64)
     ../tools/jldownload https://cmake.org/files/v$CMAKE_VERSION_MAJMIN/$FULLNAME.tar.gz
-    echo "$CMAKE_SHA256_LINUX $FULLNAME.tar.gz" | sha256sum -c -
+    echo "$CMAKE_SHA256_LINUX  $FULLNAME.tar.gz" | sha256sum -c -
     CMAKE_EXTRACTED_PATH=$FULLNAME/bin/cmake;;
   *)
     echo "This script only supports x86_64 Mac and Linux. For other platforms," >&2