diff --git a/bin/dart b/bin/dart index 42743f7ae563..0c1f402819be 100755 --- a/bin/dart +++ b/bin/dart @@ -48,7 +48,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" OS="$(uname -s)" # If we're on Windows, invoke the batch script instead to get proper locking. -if [[ $OS =~ MINGW.* || $OS =~ CYGWIN.* ]]; then +if [[ $OS =~ MINGW.* || $OS =~ CYGWIN.* || $OS =~ MSYS.* ]]; then exec "${BIN_DIR}/dart.bat" "$@" fi diff --git a/bin/flutter b/bin/flutter index 591b0107cb32..9347b8dad694 100755 --- a/bin/flutter +++ b/bin/flutter @@ -53,7 +53,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" OS="$(uname -s)" # If we're on Windows, invoke the batch script instead to get proper locking. -if [[ $OS =~ MINGW.* || $OS =~ CYGWIN.* ]]; then +if [[ $OS =~ MINGW.* || $OS =~ CYGWIN.* || $OS =~ MSYS.* ]]; then exec "${BIN_DIR}/flutter.bat" "$@" fi diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh index 76717114f546..4a4d6534e71d 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -200,7 +200,7 @@ function shared::execute() { # If running over git-bash, overrides the default UNIX executables with win32 # executables case "$(uname -s)" in - MINGW*) + MINGW* | MSYS* ) DART="$DART.exe" ;; esac diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 49e4698a824e..82bd39c1f913 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -102,7 +102,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t DART_ZIP_NAME="dart-sdk-linux-${ARCH}.zip" IS_USER_EXECUTABLE="-perm /u+x" ;; - MINGW*) + MINGW* | MSYS* ) DART_ZIP_NAME="dart-sdk-windows-x64.zip" IS_USER_EXECUTABLE="-perm /u+x" ;;