From 09dcc777eeaff3054d39b91a3ebff2e96c69a103 Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@qt.io>
Date: Thu, 6 Feb 2020 19:45:36 +0100
Subject: [PATCH] Execute a specific version of homebrew install script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also first try to download it from local mirror.

This install script appears to be doing a lot of git-cloning and downloading
itself though, so it is still far from the ideal solution: to only download
from locally cached endpoints.

Task-number: QTQAINFRA-3134
Change-Id: I32131045d6e62f302ec666b4ac055ca5ee9662d5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c0033df4b98eee349fcd7b92f35cb6ee4ca18927)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 coin/provisioning/common/macos/homebrew.sh    | 24 ++++++++++++++++---
 .../qtci-macos-10.13-x86_64/25-homebrew.sh    |  2 +-
 .../qtci-macos-10.14-x86_64/25-homebrew.sh    |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh
index a6efe123..66463c44 100755
--- a/coin/provisioning/common/macos/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
@@ -1,3 +1,21 @@
-#!/usr/bin/env bash
-# Will install homebrew package manager for macOS
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
+#!/bin/sh
+
+
+# Will install homebrew package manager for macOS.
+#     WARNING: Requires commandlinetools
+
+
+set -e
+
+. "$(dirname "$0")"/../../common/unix/DownloadURL.sh
+
+
+DownloadURL  \
+    http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb  \
+    https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install  \
+    b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a  \
+    /tmp/homebrew_install
+/usr/bin/ruby /tmp/homebrew_install  </dev/null
+
+# No need to manually do `brew update`, the homebrew installer script does it.
+### brew update
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
index 06e984ec..f7f9e214 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
 BASEDIR=$(dirname "$0")
 "$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh
index 06e984ec..f7f9e214 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
 BASEDIR=$(dirname "$0")
 "$BASEDIR/../common/macos/homebrew.sh"