Unverified Commit db8d1a44 authored by Deokgyu Yang's avatar Deokgyu Yang Committed by GitHub

Add MSYS2 detection on Windows Terminal (#117612)

As the results of "uname -s" command is like the below on MSYS2 on
Windows Terminal,

MSYS_NT-10.0-22621

This patch fixes the Flutter command working on this kind of systems.
Signed-off-by: 's avatarDeokgyu Yang <secugyu@gmail.com>
Signed-off-by: 's avatarDeokgyu Yang <secugyu@gmail.com>
parent ace4fb5c
...@@ -48,7 +48,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" ...@@ -48,7 +48,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
OS="$(uname -s)" OS="$(uname -s)"
# If we're on Windows, invoke the batch script instead to get proper locking. # 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" "$@" exec "${BIN_DIR}/dart.bat" "$@"
fi fi
......
...@@ -53,7 +53,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" ...@@ -53,7 +53,7 @@ BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
OS="$(uname -s)" OS="$(uname -s)"
# If we're on Windows, invoke the batch script instead to get proper locking. # 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" "$@" exec "${BIN_DIR}/flutter.bat" "$@"
fi fi
......
...@@ -200,7 +200,7 @@ function shared::execute() { ...@@ -200,7 +200,7 @@ function shared::execute() {
# If running over git-bash, overrides the default UNIX executables with win32 # If running over git-bash, overrides the default UNIX executables with win32
# executables # executables
case "$(uname -s)" in case "$(uname -s)" in
MINGW*) MINGW* | MSYS* )
DART="$DART.exe" DART="$DART.exe"
;; ;;
esac esac
......
...@@ -102,7 +102,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t ...@@ -102,7 +102,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
DART_ZIP_NAME="dart-sdk-linux-${ARCH}.zip" DART_ZIP_NAME="dart-sdk-linux-${ARCH}.zip"
IS_USER_EXECUTABLE="-perm /u+x" IS_USER_EXECUTABLE="-perm /u+x"
;; ;;
MINGW*) MINGW* | MSYS* )
DART_ZIP_NAME="dart-sdk-windows-x64.zip" DART_ZIP_NAME="dart-sdk-windows-x64.zip"
IS_USER_EXECUTABLE="-perm /u+x" IS_USER_EXECUTABLE="-perm /u+x"
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment