From 2e26978416dd63d4c6e47f6dc51e5d740b942d2d Mon Sep 17 00:00:00 2001
From: Yuxiang Zhang <z4yx@users.noreply.github.com>
Date: Wed, 10 Mar 2021 20:58:58 +0800
Subject: [PATCH] flutter bucket name change as mentioned in
 flutter/flutter#75363

---
 flutter.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/flutter.sh b/flutter.sh
index 8158bb5..079e7ab 100755
--- a/flutter.sh
+++ b/flutter.sh
@@ -3,15 +3,16 @@
 
 DEST_DIR="${TUNASYNC_WORKING_DIR}"
 SYNC_FLUTTER_ENGINES=latest_tags
+FLUTTER_INFRA_BUCKET=flutter_infra_release
 
 mkdir "${DEST_DIR}/dart-archive/channels/stable/release" \
-    "${DEST_DIR}/flutter_infra/releases" \
+    "${DEST_DIR}/${FLUTTER_INFRA_BUCKET}/releases" \
     2>/dev/null || true
 
 gsutil rsync -d -C -r -x '(1\..+/|\d{5}/|.+/api-docs)' gs://dart-archive/channels/stable/release \
     "${DEST_DIR}/dart-archive/channels/stable/release"
-gsutil rsync -d -C -r -x '(dev|beta)' gs://flutter_infra/releases \
-    "${DEST_DIR}/flutter_infra/releases"
+gsutil rsync -d -C -r -x '(dev|beta)' gs://${FLUTTER_INFRA_BUCKET}/releases \
+    "${DEST_DIR}/${FLUTTER_INFRA_BUCKET}/releases"
 
 cur_engine_list=/tmp/cur_engine_list.txt
 >$cur_engine_list
@@ -19,7 +20,7 @@ cur_engine_list=/tmp/cur_engine_list.txt
 function sync_engine() {
     [[ -z "$1" ]] && exit 1
     echo $1 >>$cur_engine_list
-    path="flutter_infra/flutter/$1"
+    path="${FLUTTER_INFRA_BUCKET}/flutter/$1"
     mkdir -p "${DEST_DIR}/$path" 2>/dev/null || true
     gsutil -m rsync -d -C -r "gs://$path" "${DEST_DIR}/$path"
 }
@@ -38,7 +39,7 @@ elif [[ "$SYNC_FLUTTER_ENGINES" == "latest_tags" ]]; then
         echo "======== branch ${branch}, engine version ($engine_version) ========"
         sync_engine "$engine_version"
 
-        for i in ${DEST_DIR}/flutter_infra/releases/${branch}/macos/*.zip; do
+        for i in ${DEST_DIR}/${FLUTTER_INFRA_BUCKET}/releases/${branch}/macos/*.zip; do
             [[ -f "$i" ]] || continue
             engine_version=$(unzip -p "$i" flutter/bin/internal/engine.version)
             echo "======== installer name ${i##*/}, engine version ($engine_version) ========"
@@ -48,18 +49,18 @@ elif [[ "$SYNC_FLUTTER_ENGINES" == "latest_tags" ]]; then
 fi
 
 #cat $cur_engine_list
-find ${DEST_DIR}/flutter_infra/flutter -maxdepth 1 -mindepth 1 -mtime +90 | while read line; do
-    # $line looks like '/xxx/flutter/flutter_infra/flutter/ca7623eb39d74a8cbdd095fcc7db398267b6928f'
+find ${DEST_DIR}/${FLUTTER_INFRA_BUCKET}/flutter -maxdepth 1 -mindepth 1 -mtime +90 | while read line; do
+    # $line looks like '/xxx/flutter/flutter_infra_release/flutter/ca7623eb39d74a8cbdd095fcc7db398267b6928f'
     version=${line##*/}
     grep --quiet "$version" "$cur_engine_list" || ( echo "Removing $line"; rm -rf "$line" )
 done
 
 
-for path in "flutter_infra/ios-usb-dependencies" \
-            "flutter_infra/flutter/fonts" \
-            "flutter_infra/gradle-wrapper" \
+for path in "${FLUTTER_INFRA_BUCKET}/ios-usb-dependencies" \
+            "${FLUTTER_INFRA_BUCKET}/flutter/fonts" \
+            "${FLUTTER_INFRA_BUCKET}/gradle-wrapper" \
             "download.flutter.io"
 do
     mkdir -p "${DEST_DIR}/$path" 2>/dev/null || true
     gsutil rsync -d -C -r "gs://$path" "${DEST_DIR}/$path"
-done
\ No newline at end of file
+done