From 0d93dd2fc97a0708d5f35ccda0e1be53c996630d Mon Sep 17 00:00:00 2001
From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:48:31 +0700
Subject: [PATCH] [macOS] brew --cask option fix. (#2325)

* [macOS] brew --cask option fix.

* removed curl from HS

* return curl back
---
 images/macos/provision/core/audiodevice.sh | 2 +-
 images/macos/provision/core/aws.sh         | 2 +-
 images/macos/provision/core/chrome.sh      | 2 +-
 images/macos/provision/core/commonutils.sh | 2 +-
 images/macos/provision/core/edge.sh        | 2 +-
 images/macos/provision/core/firefox.sh     | 2 +-
 images/macos/provision/core/openjdk.sh     | 2 +-
 images/macos/provision/core/powershell.sh  | 2 +-
 images/macos/provision/utils/utils.sh      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/provision/core/audiodevice.sh
index d484513b0..908f56117 100644
--- a/images/macos/provision/core/audiodevice.sh
+++ b/images/macos/provision/core/audiodevice.sh
@@ -2,7 +2,7 @@
 source ~/utils/invoke-tests.sh
 
 echo "install soundflower"
-brew cask install soundflower
+brew install --cask soundflower
 
 echo "install switchaudio-osx"
 brew install switchaudio-osx
diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index 791afc0d7..942c8d2f2 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -13,6 +13,6 @@ brew tap aws/tap
 brew install aws-sam-cli
 
 echo "Install aws cli session manager"
-brew cask install session-manager-plugin
+brew install --cask session-manager-plugin
 
 invoke_tests "Common" "AWS"
\ No newline at end of file
diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh
index 6f0d6c198..c11f98905 100644
--- a/images/macos/provision/core/chrome.sh
+++ b/images/macos/provision/core/chrome.sh
@@ -6,7 +6,7 @@ echo "Installing Chrome..."
 brew_cask_install_ignoring_sha256 "google-chrome"
 
 echo "Installing Chrome Driver"
-brew cask install chromedriver
+brew install --cask chromedriver
 
 echo "Installing Selenium"
 brew install selenium-server-standalone
diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh
index ff14e1239..771d83c44 100644
--- a/images/macos/provision/core/commonutils.sh
+++ b/images/macos/provision/core/commonutils.sh
@@ -53,7 +53,7 @@ fi
 
 for package in ${bcask_common_utils[@]}; do
     echo "Install $package"
-    brew cask install $package
+    brew install --cask $package
 done
 
 # Invoke bazel to download the latest bazel version via bazelisk
diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh
index 836522bd8..be727f49b 100644
--- a/images/macos/provision/core/edge.sh
+++ b/images/macos/provision/core/edge.sh
@@ -3,7 +3,7 @@ source ~/utils/utils.sh
 source ~/utils/invoke-tests.sh
 
 echo "Installing Microsoft Edge..."
-brew cask install microsoft-edge
+brew install --cask microsoft-edge
 
 EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
 EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)
diff --git a/images/macos/provision/core/firefox.sh b/images/macos/provision/core/firefox.sh
index 6fd9cf9b5..b55264f16 100644
--- a/images/macos/provision/core/firefox.sh
+++ b/images/macos/provision/core/firefox.sh
@@ -2,7 +2,7 @@
 source ~/utils/invoke-tests.sh
 
 echo "Installing Firefox..."
-brew cask install firefox
+brew install --cask firefox
 
 echo "Installing Geckodriver..."
 brew install geckodriver
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
index fc83275b2..8907f6f42 100644
--- a/images/macos/provision/core/openjdk.sh
+++ b/images/macos/provision/core/openjdk.sh
@@ -37,7 +37,7 @@ do
     if [[ $JAVA_VERSION == "7" ]]; then
         installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.51-ca-jdk7.0.285-macosx_x64.dmg"
     else
-        brew cask install "adoptopenjdk${JAVA_VERSION}"
+        brew install --cask "adoptopenjdk${JAVA_VERSION}"
     fi
     createEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" $JAVA_VERSION
 done
diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh
index d040364c5..eb6494bfe 100644
--- a/images/macos/provision/core/powershell.sh
+++ b/images/macos/provision/core/powershell.sh
@@ -7,7 +7,7 @@ echo Installing Azure CLI...
 brew install azure-cli
 
 echo Installing PowerShell...
-brew cask install powershell
+brew install --cask powershell
 
 # A dummy call of `az` to initialize ~/.azure directory before the modules are installed
 az -v
diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh
index fab443e70..16380d942 100755
--- a/images/macos/provision/utils/utils.sh
+++ b/images/macos/provision/utils/utils.sh
@@ -104,7 +104,7 @@ brew_cask_install_ignoring_sha256() {
     chmod a+w "$CASK_DIR/$TOOL_NAME.rb"
     SHA=$(grep "sha256" "$CASK_DIR/$TOOL_NAME.rb" | awk '{print $2}')
     sed -i '' "s/$SHA/:no_check/" "$CASK_DIR/$TOOL_NAME.rb"
-    brew cask install $TOOL_NAME
+    brew install --cask $TOOL_NAME
     pushd $CASK_DIR
     git checkout HEAD -- "$TOOL_NAME.rb"
     popd