Fix SDK-detection in pub_worker. (#6776)

dart-lang · Jun 21, 2023 · b10596d · b10596d
1 parent 5b5faea
commit b10596d
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/pkg/pub_worker/lib/src/sdks.dart b/pkg/pub_worker/lib/src/sdks.dart
@@ -35,6 +35,25 @@ class InstalledSdk {
         continue;
       }
       try {
+        // all SDKs have bin/ directory
+        final binDir = Directory(p.join(d.path, 'bin'));
+        if (!(await binDir.exists())) {
+          continue;
+        }
+        // only Dart SDK has lib/
+        // only Flutter SDK has packages/
+        if (kind == 'dart') {
+          final libDir = Directory(p.join(d.path, 'lib'));
+          if (!(await libDir.exists())) {
+            continue;
+          }
+        } else if (kind == 'flutter') {
+          final packagesDir = Directory(p.join(d.path, 'packages'));
+          if (!(await packagesDir.exists())) {
+            continue;
+          }
+        }
+
         final v = await File(p.join(d.path, 'version')).readAsString();
         sdks.add(InstalledSdk(kind, d.path, Version.parse(v.trim())));
       } on FormatException {