Fix flutter bin path

phntmxyz · Oct 8, 2024 · daa8dff · daa8dff
1 parent 8005312
commit daa8dff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/lib/puro_sidekick_plugin.dart b/lib/puro_sidekick_plugin.dart
@@ -24,15 +24,21 @@ void initializePuro(SdkInitializerContext context) {
   _setupFlutterEnvironment(context);
 
   // Create symlink to puro flutter sdk
-  final flutterPath = puroFlutterSdkPath();
-  dcli.env['PURO_FLUTTER_BIN'] = flutterPath;
+  final packageDir = context.packageDir?.root ?? SidekickContext.projectRoot;
+  final flutterPath = puroFlutterSdkPath(packageDir);
+
+  final flutterBinPath = Directory(flutterPath).directory('bin');
+
+  dcli.env['PURO_FLUTTER_BIN'] = flutterBinPath.absolute.path;
   print('Use Puro Flutter SDK: $flutterPath');
   createSymlink(symlinkPath, flutterPath);
 }
 
 void _setupFlutterEnvironment(SdkInitializerContext context) {
+  final packageDir = context.packageDir?.root ?? SidekickContext.projectRoot;
+
   final sdkVersion = VersionParser(
-    packagePath: context.packageDir?.root ?? SidekickContext.projectRoot,
+    packagePath: packageDir,
     projectRoot: SidekickContext.projectRoot,
   ).getMaxFlutterSdkVersionFromPubspec();
 
@@ -46,7 +52,7 @@ void _setupFlutterEnvironment(SdkInitializerContext context) {
   }
   print('Use Puro environment: $sdkVersion');
   puro(
-    ['use', '--project', entryWorkingDirectory.path, sdkVersion],
+    ['use', '--project', packageDir.absolute.path, sdkVersion],
     progress: Progress.print(),
   );
 }

diff --git a/lib/src/flutter_sdk.dart b/lib/src/flutter_sdk.dart
@@ -13,19 +13,20 @@ String flutterSdkSymlink() {
 
 /// Returns the Flutter SDK path from puro environment
 /// throws [PuroNotFoundException] if puro is not found
-String puroFlutterSdkPath() {
+String puroFlutterSdkPath(Directory packageDir) {
   String? envPath;
   final pathMatcher = RegExp(r'.*executing: \[(.*)\].*');
+  final progress = Progress.capture();
   puro(
     ['flutter', '-v', '--version'],
-    progress: Progress((line) {
-      if (envPath != null) return;
-      final match = pathMatcher.firstMatch(line);
-      if (match != null) {
-        envPath = match.group(1);
-      }
-    }),
+    progress: progress,
+    workingDirectory: packageDir,
   );
+  final currentEnvs = progress.lines.join('\n');
+  final match = pathMatcher.firstMatch(currentEnvs);
+  if (match != null) {
+    envPath = match.group(1);
+  }
   if (envPath == null) {
     throw PuroNotFoundException();
   }