Revert "Fix macOS setup"

This reverts commit 0c4c4d5441.
This commit is contained in:
Shivam Mathur 2021-04-15 16:48:29 +05:30
parent bceb2ef3d8
commit e9a7adef28
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A

View File

@ -75,9 +75,6 @@ add_brew_extension() {
if check_extension "$extension"; then if check_extension "$extension"; then
add_log "${tick:?}" "$extension" "Enabled" add_log "${tick:?}" "$extension" "Enabled"
else else
# Remove once homebrew is updated
update_brew
add_brew_tap shivammathur/homebrew-php add_brew_tap shivammathur/homebrew-php
add_brew_tap shivammathur/homebrew-extensions add_brew_tap shivammathur/homebrew-extensions
sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
@ -132,20 +129,8 @@ update_dependencies_helper() {
link_libraries "$formula" link_libraries "$formula"
} }
# Function to update brew
update_brew() {
if ! [ -e /tmp/brew_updated ]; then
git -C "$brew_repo" pull origin master >/dev/null 2>&1
git -C "$tap_dir/homebrew/homebrew-core" pull origin master >/dev/null 2>&1
echo '' | sudo tee /tmp/brew_updated >/dev/null 2>&1
fi
}
# Function to update dependencies. # Function to update dependencies.
update_dependencies() { update_dependencies() {
# Remove once homebrew is updated
update_brew
if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
while read -r formula; do while read -r formula; do
update_dependencies_helper "$formula" & update_dependencies_helper "$formula" &