Merge pull request dart-archive/cli_util#4 from dart-lang/null_link_fix

Null link fix

Author: pq

pkgs/cli_util/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.1+1
+
+- Fix for when the dart executable can't be found by `which`.
+
 ## 0.0.1
 
 - Initial version

pkgs/cli_util/lib/cli_util.dart

@@ -38,15 +38,17 @@ Directory getSdkDir([List<String> cliArgs]) {
   // Try and locate the VM using 'which'.
   String executable = whichSync('dart', orElse: () => null);
 
-  // In case Dart is symlinked (e.g. homebrew on Mac) follow symbolic links.
-  Link link = new Link(executable);
-  if (link.existsSync()) {
-    executable = link.resolveSymbolicLinksSync();
-  }
+  if (executable != null) {
+    // In case Dart is symlinked (e.g. homebrew on Mac) follow symbolic links.
+    Link link = new Link(executable);
+    if (link.existsSync()) {
+      executable = link.resolveSymbolicLinksSync();
+    }
 
-  File dartVm = new File(executable);
-  Directory dir = dartVm.parent.parent;
-  if (_isSdkDir(dir)) return dir;
+    File dartVm = new File(executable);
+    Directory dir = dartVm.parent.parent;
+    if (_isSdkDir(dir)) return dir;
+  }
 
   return null;
 }

pkgs/cli_util/pubspec.yaml

@@ -1,5 +1,5 @@
 name: cli_util
-version: 0.0.1
+version: 0.0.1+1
 author: Dart Team <misc@dartlang.org>
 description: A library to help in building Dart command-line apps.
 homepage: https://github.com/dart-lang/cli_util