Fix Homebrew checks

This commit is contained in:
Alexandre Lissy 2020-06-02 13:47:51 +02:00
parent 00577873ce
commit f925dd9fc8

View File

@ -40,7 +40,7 @@ do_prepare_homebrew()
curl -L ${BREW_URL} | tar xz --strip 1 -C "${_brew_instance}" curl -L ${BREW_URL} | tar xz --strip 1 -C "${_brew_instance}"
fi; fi;
check_homebrew check_homebrew "${_brew_instance}"
# Force an upgrade to fetch formulae # Force an upgrade to fetch formulae
brew search openssl brew search openssl
@ -53,14 +53,16 @@ do_prepare_homebrew()
check_homebrew() check_homebrew()
{ {
echo "local brew prefix ..." local _expected_prefix=$1
local_prefix=$(brew --prefix)
echo "${local_prefix}"
if [ "${BUILDS_BREW}" != "${local_prefix}" ]; then echo "local brew prefix ..."
local _local_prefix=$(brew --prefix)
echo "${_local_prefix}"
if [ "${_expected_prefix}" != "${_local_prefix}" ]; then
echo "Weird state:" echo "Weird state:"
echo "BUILDS_BREW=${BUILDS_BREW}" echo "_expected_prefix=${_expected_prefix}"
echo "local_prefix=${local_prefix}" echo "_local_prefix=${_local_prefix}"
exit 1 exit 1
fi; fi;
} }