commit f221c3a23c70a0f32824c04bd1499988301f7fe9
author Christopher Fujino <christopherfujino@gmail.com> Fri Oct 29 08:43:36 2021 -0700
committer GitHub <noreply@github.com> Fri Oct 29 08:43:36 2021 -0700
tree c57586e5e010bd809de54722ca498c974bfcf41e
parent fc7015e35aac7ab785e7ae15a47db5c9e669ec7f

conductor fixes (#92620)

dev/conductor/bin/conductor

diff --git a/dev/conductor/bin/conductor b/dev/conductor/bin/conductor
index 602d520..29cb05e 100755
--- a/dev/conductor/bin/conductor
+++ b/dev/conductor/bin/conductor
@@ -38,6 +38,6 @@
 DART_BIN="$REPO_DIR/bin/dart"
 
 # Ensure pub get has been run in the repo before running the conductor
-(cd "$REPO_DIR/dev/conductor/core"; $DART_BIN pub get 1>&2)
+(cd "$REPO_DIR/dev/conductor/core"; "$DART_BIN" pub get 1>&2)
 
 "$DART_BIN" --enable-asserts "$REPO_DIR/dev/conductor/core/bin/cli.dart" "$@"

dev/conductor/core/lib/src/globals.dart

diff --git a/dev/conductor/core/lib/src/globals.dart b/dev/conductor/core/lib/src/globals.dart
index 91f76a6..4072c48 100644
--- a/dev/conductor/core/lib/src/globals.dart
+++ b/dev/conductor/core/lib/src/globals.dart
@@ -54,7 +54,8 @@
   final String checkoutsDirname = fileSystem.path.normalize(
     fileSystem.path.join(
       fileSystem.path.dirname(filePath),
-      '..', // flutter/dev/tools
+      '..', // flutter/dev/conductor/core
+      '..', // flutter/dev/conductor
       '..', // flutter/dev
       '..', // flutter
     ),