From fb88a7bfd131c2d89b65e1429979b43f01bdd7b9 Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Fri, 21 Dec 2018 10:12:49 -0800 Subject: [PATCH] Update links for China help (#25238) We have a page on the Web page now. --- bin/internal/update_dart_sdk.sh | 12 ++++++------ packages/flutter_tools/lib/src/cache.dart | 6 +++--- packages/flutter_tools/test/cache_test.dart | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 630e3157a3..bc35d77a87 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -53,18 +53,18 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t curl --continue-at - --location --output "$DART_SDK_ZIP" "$DART_SDK_URL" 2>&1 || { echo - echo "Failed to retrieve the Dart SDK at $DART_SDK_URL" - echo "If you're located in China, please follow" - echo "https://github.com/flutter/flutter/wiki/Using-Flutter-in-China" + echo "Failed to retrieve the Dart SDK from: $DART_SDK_URL" + echo "If you're located in China, please see this page:" + echo " https://flutter.io/community/china" echo rm -f -- "$DART_SDK_ZIP" exit 1 } unzip -o -q "$DART_SDK_ZIP" -d "$FLUTTER_ROOT/bin/cache" || { echo - echo "It appears that the downloaded file is corrupt; please try the operation again later." - echo "If this problem persists, please report the problem at" - echo "https://github.com/flutter/flutter/issues/new?template=ACTIVATION.md" + echo "It appears that the downloaded file is corrupt; please try again." + echo "If this problem persists, please report the problem at:" + echo " https://github.com/flutter/flutter/issues/new?template=ACTIVATION.md" echo rm -f -- "$DART_SDK_ZIP" exit 1 diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index dfa3377255..28cbc0b23e 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -221,9 +221,9 @@ class Cache { } on SocketException catch (e) { if (_hostsBlockedInChina.contains(e.address?.host)) { printError( - 'Failed to retrieve Flutter tool depedencies: ${e.message}.\n' - "If you're in China, please follow " - 'https://github.com/flutter/flutter/wiki/Using-Flutter-in-China', + 'Failed to retrieve Flutter tool dependencies: ${e.message}.\n' + 'If you\'re in China, please see this page: ' + 'https://flutter.io/community/china', emphasis: true, ); } diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/cache_test.dart index 2c3e03fc65..36bf2cec7e 100644 --- a/packages/flutter_tools/test/cache_test.dart +++ b/packages/flutter_tools/test/cache_test.dart @@ -98,7 +98,7 @@ void main() { verifyNever(artifact2.update()); expect( testLogger.errorText, - contains('https://github.com/flutter/flutter/wiki/Using-Flutter-in-China'), + contains('https://flutter.io/community/china'), ); } });