[macos] use brew_smart_install where appropriate (#8607)

images/macos/provision/core/apache.sh

@@ -1,6 +1,8 @@
 #!/bin/bash -e -o pipefail
 
-brew install httpd
+source ~/utils/utils.sh
+
+brew_smart_install httpd
 sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf
 
 invoke_tests "WebServers" "Apache"

images/macos/provision/core/aws.sh

@@ -8,7 +8,7 @@ sudo installer -pkg /tmp/AWSCLIV2.pkg -target /
 
 echo Installing aws sam cli...
 brew tap aws/tap
-brew install aws-sam-cli
+brew_smart_install aws-sam-cli
 
 echo "Install aws cli session manager"
 brew install --cask session-manager-plugin

images/macos/provision/core/azcopy.sh

@@ -4,7 +4,7 @@ arch=$(get_arch)
 
 # Check MacOS architecture and if ARM install using brew
 if [ $arch == "arm64" ]; then
-    brew install azcopy
+    brew_smart_install azcopy
 else
     AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac"
 

images/macos/provision/core/bicep.sh

@@ -1,7 +1,9 @@
 #!/bin/bash -e -o pipefail
 
+source ~/utils/utils.sh
+
 echo Installing bicep cli...
 brew tap azure/bicep
-brew install bicep
+brew_smart_install bicep
 
 invoke_tests "Common" "Bicep"

images/macos/provision/core/homebrew.sh

@@ -27,10 +27,10 @@ brew analytics off
 
 # jq is required for further installation scripts
 echo "Installing jq..."
-brew install jq
+brew_smart_install jq
 
 echo "Installing curl..."
-brew install curl
+brew_smart_install curl
 
 echo "Installing wget..."
 brew_smart_install "wget"

images/macos/provision/core/nginx.sh

@@ -1,6 +1,8 @@
 #!/bin/bash -e -o pipefail
 
-brew install nginx
+source ~/utils/utils.sh
+
+brew_smart_install nginx
 sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf
 
 invoke_tests "WebServers" "Nginx"