2020-11-03 02:18:15 +00:00
|
|
|
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
|
2021-06-28 23:13:55 +00:00
|
|
|
index be9320210e..6eb50aae95 100644
|
2020-11-03 02:18:15 +00:00
|
|
|
--- a/bin/internal/shared.sh
|
|
|
|
+++ b/bin/internal/shared.sh
|
2021-04-05 15:23:46 +00:00
|
|
|
@@ -218,8 +218,6 @@ function shared::execute() {
|
2020-11-03 02:18:15 +00:00
|
|
|
# FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
|
|
|
|
# FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
|
2020-04-24 23:36:52 +00:00
|
|
|
|
2020-11-03 02:18:15 +00:00
|
|
|
- upgrade_flutter 7< "$PROG_NAME"
|
2020-04-24 23:36:52 +00:00
|
|
|
-
|
2020-11-03 02:18:15 +00:00
|
|
|
BIN_NAME="$(basename "$PROG_NAME")"
|
|
|
|
case "$BIN_NAME" in
|
|
|
|
flutter*)
|
2020-04-24 23:36:52 +00:00
|
|
|
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
2021-06-28 23:13:55 +00:00
|
|
|
index 550a75bc65..c98a4591cc 100644
|
2020-04-24 23:36:52 +00:00
|
|
|
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
|
|
|
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
2021-06-28 23:13:55 +00:00
|
|
|
@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
2020-11-03 02:18:15 +00:00
|
|
|
globals.flutterUsage.suppressAnalytics = true;
|
2020-04-24 23:36:52 +00:00
|
|
|
}
|
|
|
|
|
2021-04-05 15:23:46 +00:00
|
|
|
- globals.flutterVersion.ensureVersionFile();
|
2020-08-20 17:08:02 +00:00
|
|
|
final bool machineFlag = topLevelResults['machine'] as bool;
|
2021-06-28 23:13:55 +00:00
|
|
|
final bool ci = await globals.botDetector.isRunningOnBot;
|
|
|
|
final bool redirectedCompletion = !globals.stdio.hasTerminal &&
|
|
|
|
@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
|
|
|
final bool versionCheckFlag = topLevelResults['version-check'] as bool;
|
|
|
|
final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
|
|
|
|
|
|
|
|
- if (topLevelResults.command?.name != 'upgrade' &&
|
|
|
|
- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
|
2021-04-05 15:23:46 +00:00
|
|
|
- await globals.flutterVersion.checkFlutterVersionFreshness();
|
|
|
|
- }
|
|
|
|
|
|
|
|
// See if the user specified a specific device.
|
|
|
|
globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String;
|