From 096e01637269fa56e0f4c8291b4a9904089962e2 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Fri, 23 Oct 2020 11:09:22 +0300 Subject: [PATCH 1/3] untap formulas --- images/macos/provision/core/openssl.sh | 12 +++++------- images/macos/provision/core/python.sh | 17 +++++++++-------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index a058673a6..b4acd4303 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -2,18 +2,16 @@ source ~/utils/utils.sh -echo "Installing OpenSSL..." -export PATH="/usr/local/bin:/usr/local/sbin:~/bin:$PATH" - echo Installing OpenSSL... -/usr/local/bin/brew install openssl +brew install openssl # Install OpenSSL 1.0.2t # https://www.openssl.org/policies/releasestrat.html - Version 1.0.2 will be supported until 2019-12-31 (LTS) # To preserve backward compatibility with ruby-toolcache -/usr/local/bin/brew tap-new local/openssl -FORMULA_PATH=$(/usr/local/bin/brew extract openssl local/openssl | grep "Homebrew/Library/Taps") -/usr/local/bin/brew install $FORMULA_PATH +brew tap-new local/openssl +FORMULA_PATH=$(brew extract openssl local/openssl | grep "Homebrew/Library/Taps") +brew install $FORMULA_PATH +brew untap local/homebrew-openssl # Set OpenSSL 1.0.2t as default ln -sf /usr/local/Cellar/openssl@1.0.2t /usr/local/Cellar/openssl diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 1565ced20..13e054fe7 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -5,14 +5,15 @@ echo "Installing Python Tooling" echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked -/usr/local/bin/brew install python@3.8 -/usr/local/bin/brew install python@3.9 -/usr/local/bin/brew unlink python@3.9 -/usr/local/bin/brew unlink python@3.8 -/usr/local/bin/brew link python@3.8 +brew install python@3.8 +brew install python@3.9 +brew unlink python@3.9 +brew unlink python@3.8 +brew link python@3.8 echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation -/usr/local/bin/brew tap-new local/python2 -FORMULA_PATH=$(/usr/local/bin/brew extract python@2 local/python2 | grep "Homebrew/Library/Taps") -/usr/local/bin/brew install $FORMULA_PATH +brew tap-new local/python2 +FORMULA_PATH=$(brew extract python@2 local/python2 | grep "Homebrew/Library/Taps") +brew install $FORMULA_PATH +brew untap local/homebrew-python2 From 73c5b0bf879ab16a804170af0670a89560d4aa1a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Fri, 23 Oct 2020 20:12:52 +0300 Subject: [PATCH 2/3] Update images/macos/provision/core/openssl.sh Co-authored-by: Mike McQuaid --- images/macos/provision/core/openssl.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index b4acd4303..ff6c3ff09 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -8,10 +8,9 @@ brew install openssl # Install OpenSSL 1.0.2t # https://www.openssl.org/policies/releasestrat.html - Version 1.0.2 will be supported until 2019-12-31 (LTS) # To preserve backward compatibility with ruby-toolcache -brew tap-new local/openssl +brew tap-new --no-git local/openssl FORMULA_PATH=$(brew extract openssl local/openssl | grep "Homebrew/Library/Taps") brew install $FORMULA_PATH -brew untap local/homebrew-openssl # Set OpenSSL 1.0.2t as default ln -sf /usr/local/Cellar/openssl@1.0.2t /usr/local/Cellar/openssl @@ -23,4 +22,4 @@ ln -sf ../Cellar/openssl/1.0.2t /usr/local/opt/openssl # https://github.com/microsoft/azure-pipelines-agent/blob/master/docs/start/envosx.md mkdir -p /usr/local/lib/ ln -s /usr/local/opt/openssl@1.0.2t/lib/libcrypto.1.0.0.dylib /usr/local/lib/ -ln -s /usr/local/opt/openssl@1.0.2t/lib/libssl.1.0.0.dylib /usr/local/lib/ \ No newline at end of file +ln -s /usr/local/opt/openssl@1.0.2t/lib/libssl.1.0.0.dylib /usr/local/lib/ From bbb8bd3f4ca995d718ce79da8651b0465270af01 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Fri, 23 Oct 2020 20:12:58 +0300 Subject: [PATCH 3/3] Update images/macos/provision/core/python.sh Co-authored-by: Mike McQuaid --- images/macos/provision/core/python.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 13e054fe7..d0a56ee1c 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -13,7 +13,6 @@ brew link python@3.8 echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation -brew tap-new local/python2 +brew tap-new --no-git local/python2 FORMULA_PATH=$(brew extract python@2 local/python2 | grep "Homebrew/Library/Taps") brew install $FORMULA_PATH -brew untap local/homebrew-python2