flutter/shorebird
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: shorebird install/upgrade workspace support (#3144)

Browse Source
This commit is contained in:
Felix Angelov
2025-06-04 09:43:28 -05:00
committed by GitHub
parent 10cbfd8563
commit 09d3c97ec0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/flutter/bin/internal/shared.sh
Vendored
+3 -3
View File
@@ -129,7 +129,7 @@ function upgrade_shorebird () (
# * STAMP_PATH is an empty file, or # * STAMP_PATH is an empty file, or
# * Contents of STAMP_PATH is not what we are going to compile, or # * Contents of STAMP_PATH is not what we are going to compile, or
# * pubspec.yaml last modified after pubspec.lock # * pubspec.yaml last modified after pubspec.lock
if [[ ! -f "$SNAPSHOT_PATH" || ! -s "$STAMP_PATH" || "$(cat "$STAMP_PATH")" != "$compilekey" || "$SHOREBIRD_CLI_DIR/pubspec.yaml" -nt "$SHOREBIRD_CLI_DIR/pubspec.lock" ]]; then if [[ ! -f "$SNAPSHOT_PATH" || ! -s "$STAMP_PATH" || "$(cat "$STAMP_PATH")" != "$compilekey" || "$SHOREBIRD_CLI_DIR/pubspec.yaml" -nt "$SHOREBIRD_ROOT/pubspec.lock" ]]; then
# Waits for the update lock to be acquired. Placing this check inside the # Waits for the update lock to be acquired. Placing this check inside the
# conditional allows the majority of flutter/dart installations to bypass # conditional allows the majority of flutter/dart installations to bypass
# the lock entirely, but as a result this required a second verification that # the lock entirely, but as a result this required a second verification that
@@ -137,7 +137,7 @@ function upgrade_shorebird () (
_wait_for_lock _wait_for_lock
# A different shell process might have updated the tool/SDK. # A different shell process might have updated the tool/SDK.
if [[ -f "$SNAPSHOT_PATH" && -s "$STAMP_PATH" && "$(cat "$STAMP_PATH")" == "$compilekey" && "$SHOREBIRD_CLI_DIR/pubspec.yaml" -ot "$SHOREBIRD_CLI_DIR/pubspec.lock" ]]; then if [[ -f "$SNAPSHOT_PATH" && -s "$STAMP_PATH" && "$(cat "$STAMP_PATH")" == "$compilekey" && "$SHOREBIRD_CLI_DIR/pubspec.yaml" -ot "$SHOREBIRD_ROOT/pubspec.lock" ]]; then
exit $? exit $?
fi fi
@@ -165,7 +165,7 @@ function upgrade_shorebird () (
fi fi
# Compile... # Compile...
$DART_PATH --verbosity=error --disable-dart-dev --snapshot="$SNAPSHOT_PATH" --snapshot-kind="app-jit" --packages="$SHOREBIRD_CLI_DIR/.dart_tool/package_config.json" --no-enable-mirrors "$SCRIPT_PATH" > /dev/null $DART_PATH --verbosity=error --disable-dart-dev --snapshot="$SNAPSHOT_PATH" --snapshot-kind="app-jit" --packages="$SHOREBIRD_ROOT/.dart_tool/package_config.json" --no-enable-mirrors "$SCRIPT_PATH" > /dev/null
echo "$compilekey" > "$STAMP_PATH" echo "$compilekey" > "$STAMP_PATH"
# Delete any temporary snapshot path. # Delete any temporary snapshot path.