From f5097bc4518c56f439a88fe155c986a57bd3dc88 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 10 Apr 2020 18:51:36 +0200 Subject: [PATCH] vagrant: macOS: avoid error if pkg is already installed --- Vagrantfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index dbb483704..664da7658 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -97,14 +97,14 @@ def packages_darwin sudo chown -R vagrant /usr/local # brew must be able to create stuff here ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update > /dev/null - brew install pkg-config - brew install readline - brew install openssl@1.1 - brew install zstd - brew install lz4 - brew install xz # required for python lzma module - brew install fakeroot - brew install git + brew install pkg-config || brew upgrade pkg-config + brew install readline || brew upgrade readline + brew install openssl@1.1 || brew upgrade openssl@1.1 + brew install zstd || brew upgrade zstd + brew install lz4 || brew upgrade lz4 + brew install xz || brew upgrade xz # required for python lzma module + brew install fakeroot || brew upgrade fakeroot + brew install git || brew upgrade git echo 'export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig' >> ~vagrant/.bash_profile EOF end