From db041de63d1c22c457838bf1f3a95c3a411d9d99 Mon Sep 17 00:00:00 2001 From: Jefferson Quesado Date: Thu, 24 Oct 2019 15:06:46 -0300 Subject: [PATCH] Detecting when installing over MingW's Git Bash, fixing paths (#39699) --- AUTHORS | 1 + bin/flutter | 9 +++++++++ bin/internal/update_dart_sdk.sh | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/AUTHORS b/AUTHORS index 156418850f..10d164d99b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -44,3 +44,4 @@ Simon Lightfoot Sarbagya Dhaubanjar Rody Davis Jr Robin Jespersen +Jefferson Quesado diff --git a/bin/flutter b/bin/flutter index 74a971267d..3955f8f391 100755 --- a/bin/flutter +++ b/bin/flutter @@ -150,6 +150,15 @@ DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART="$DART_SDK_PATH/bin/dart" PUB="$DART_SDK_PATH/bin/pub" +# If running over git-bash, overrides the default UNIX +# executables with win32 executables +case "$(uname -s)" in + MINGW32*) + DART="$DART.exe" + PUB="$PUB.bat" + ;; +esac + # Test if running as superuser – but don't warn if running within Docker if [[ "$EUID" == "0" && ! -f /.dockerenv ]]; then echo " Woah! You appear to be trying to run flutter as root." diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 761886fd98..88fcc03f2e 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -50,6 +50,10 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t DART_ZIP_NAME="dart-sdk-linux-x64.zip" IS_USER_EXECUTABLE="-perm /u+x" ;; + MINGW32*) + DART_ZIP_NAME="dart-sdk-windows-x64.zip" + IS_USER_EXECUTABLE="-perm /u+x" + ;; *) echo "Unknown operating system. Cannot install Dart SDK." exit 1