de-duped; error handling

Author: pq

tool/github.sh

@@ -21,23 +21,7 @@ echo "export PATH=$JAVA_HOME/bin:\$PATH"
 export PATH=$JAVA_HOME/bin:$PATH
 
 # Download and configure Flutter to the pinned stable release if not present
-if [ ! -d "../flutter" ]; then
-  OS_NAME=$(uname -s | tr '[:upper:]' '[:lower:]')
-  FLUTTER_VERSION="3.41.0"
-  
-  echo "Provisioning Flutter SDK version ${FLUTTER_VERSION} for ${OS_NAME}..."
-  if [ "$OS_NAME" = "darwin" ]; then
-    curl -O "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${FLUTTER_VERSION}-stable.zip"
-    unzip -q "flutter_macos_${FLUTTER_VERSION}-stable.zip" -d ../
-    rm "flutter_macos_${FLUTTER_VERSION}-stable.zip"
-  else
-    curl -O "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-    tar xf "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz" -C ../
-    rm "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-  fi
-else
-  echo "../flutter already exists, skipping download."
-fi
+source ./tool/provision_flutter.sh
 export PATH="$PATH":`pwd`/../flutter/bin:`pwd`/../flutter/bin/cache/dart-sdk/bin
 flutter config --no-analytics
 flutter doctor

tool/kokoro/setup.sh

@@ -33,23 +33,7 @@ setup() {
   export JAVA_OPTS=" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
 
   # Download and configure Flutter to the pinned stable release if not present
-  if [ ! -d "../flutter" ]; then
-    OS_NAME=$(uname -s | tr '[:upper:]' '[:lower:]')
-    FLUTTER_VERSION="3.22.0"
-    
-    echo "Provisioning Flutter SDK version ${FLUTTER_VERSION} for ${OS_NAME}..."
-    if [ "$OS_NAME" = "darwin" ]; then
-      curl -O "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${FLUTTER_VERSION}-stable.zip"
-      unzip -q "flutter_macos_${FLUTTER_VERSION}-stable.zip" -d ../
-      rm "flutter_macos_${FLUTTER_VERSION}-stable.zip"
-    else
-      curl -O "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-      tar xf "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz" -C ../
-      rm "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-    fi
-  else
-    echo "../flutter already exists, skipping download."
-  fi
+  source ./tool/provision_flutter.sh
   export PATH="$PATH":`pwd`/../flutter/bin:`pwd`/../flutter/bin/cache/dart-sdk/bin
   flutter config --no-analytics
   flutter doctor

tool/provision_flutter.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright 2026 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Fail on any error.
+set -e
+
+# Provision the pinned Flutter SDK if not present
+if [ ! -d "../flutter" ]; then
+  OS_NAME=$(uname -s | tr '[:upper:]' '[:lower:]')
+  FLUTTER_VERSION="3.41.0"
+  
+  echo "Provisioning Flutter SDK version ${FLUTTER_VERSION} for ${OS_NAME}..."
+  if [ "$OS_NAME" = "darwin" ]; then
+    curl -fLO "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${FLUTTER_VERSION}-stable.zip"
+    unzip -q "flutter_macos_${FLUTTER_VERSION}-stable.zip" -d ../
+    rm "flutter_macos_${FLUTTER_VERSION}-stable.zip"
+  else
+    curl -fLO "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+    tar xf "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz" -C ../
+    rm "flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+  fi
+else
+  echo "../flutter already exists, skipping download."
+fi