diff options
| -rwxr-xr-x | coin/provisioning/common/macos/homebrew.sh | 17 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index 715477c0..66463c44 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,12 +1,21 @@ -#!/usr/bin/env bash +#!/bin/sh # Will install homebrew package manager for macOS. # WARNING: Requires commandlinetools -# TODO audit and cache this file locally, see QTQAINFRA-3134 -curl -L -o /tmp/homebrew_install https://raw.githubusercontent.com/Homebrew/install/master/install +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 -brew update +# 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" |