From 2ee3e9b74f5fa2b8faa4187e83b3a606a80b4cf7 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Tue, 5 Apr 2022 10:23:28 -0600
Subject: [PATCH] devops: fix mingw detection (#13326)

---
 browser_patches/chromium/archive.sh | 4 ++--
 browser_patches/chromium/build.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser_patches/chromium/archive.sh b/browser_patches/chromium/archive.sh
index a222efc4c9..72f1fa593f 100755
--- a/browser_patches/chromium/archive.sh
+++ b/browser_patches/chromium/archive.sh
@@ -52,7 +52,7 @@ elif [[ $(uname) == "Linux" ]]; then
   CHROMIUM_FOLDER_NAME="chrome-linux"
   IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/linux-archive-rel.json"))
   unset IFS
-elif [[ $(uname) == "MINGW" || "$(uname)" == MSYS* ]]; then
+elif [[ $(uname) == "MINGW"* || "$(uname)" == MSYS* ]]; then
   CHROMIUM_FOLDER_NAME="chrome-win"
   IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/win-archive-rel.json"))
   unset IFS
@@ -78,7 +78,7 @@ for ((i = 0; i < ${#CHROMIUM_FILES_TO_ARCHIVE[@]}; i++)) do
   $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/${file}" "output/${CHROMIUM_FOLDER_NAME}/${file}"
 done
 
-if [[ $(uname) == "MINGW" || "$(uname)" == MSYS* ]]; then
+if [[ $(uname) == "MINGW"* || "$(uname)" == MSYS* ]]; then
   $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/"*.manifest "output/${CHROMIUM_FOLDER_NAME}/"
   mkdir -p "output/${CHROMIUM_FOLDER_NAME}/locales"
   $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/locales/"*.pak "output/${CHROMIUM_FOLDER_NAME}/locales/"
diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh
index 822f051b76..18a92afb42 100755
--- a/browser_patches/chromium/build.sh
+++ b/browser_patches/chromium/build.sh
@@ -95,7 +95,7 @@ compile_chromium() {
   fi
 
   TARGETS="${args[@]}"
-  if [[ $(uname) == "MINGW" || "$(uname)" == MSYS* ]]; then
+  if [[ $(uname) == "MINGW"* || "$(uname)" == MSYS* ]]; then
     if [[ -n "$TARGETS" ]]; then
       echo "ERROR: cannot compile custom targets on windows yet."
       echo "Requested to compile chromium targets - ${TARGETS}"