Clean up code that locates SDK and SDK version.

utils/pub/pub.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// The main entrypoint for the pub command line application.
 library pub;
 
 import 'dart:async';
 import '../../pkg/args/lib/args.dart';
 import '../../pkg/path/lib/path.dart' as path;
@@ skipping 92 matching lines @@
     default:
       // No specific verbosity given, so check for the shortcut.
       if (globalOptions['verbose']) {
         log.showAll();
       } else {
         log.showNormal();
       }
       break;
   }
 
-  // TODO(nweiz): Have a fallback for this this out automatically once 1145 is
-  // fixed.
-  var sdkDir = Platform.environment['DART_SDK'];
   var cacheDir;
   if (Platform.environment.containsKey('PUB_CACHE')) {
     cacheDir = Platform.environment['PUB_CACHE'];
   } else if (Platform.operatingSystem == 'windows') {
     var appData = Platform.environment['APPDATA'];
     cacheDir = join(appData, 'Pub', 'Cache');
   } else {
     cacheDir = '${Platform.environment['HOME']}/.pub-cache';
   }
 
-  var cache = new SystemCache.withSources(cacheDir, sdkDir);
+  var cache = new SystemCache.withSources(cacheDir);
 
   // Select the command.
   var command = pubCommands[globalOptions.rest[0]];
   if (command == null) {
     log.error('Could not find a command named "${globalOptions.rest[0]}".');
     log.error('Run "pub help" to see available commands.');
     exit(exit_codes.USAGE);
     return;
   }
 
   var commandArgs =
       globalOptions.rest.getRange(1, globalOptions.rest.length - 1);
   command.run(cache, globalOptions, commandArgs);
 }
 
-/// Displays usage information for the app. 
+/// Displays usage information for the app.
 void printUsage([String description = 'Pub is a package manager for Dart.']) {
   // Build up a buffer so it shows up as a single log entry.
   var buffer = new StringBuffer();
   buffer.add(description);
   buffer.add('\n\n');
   buffer.add('Usage: pub command [arguments]\n\n');
   buffer.add('Global options:\n');
   buffer.add('${pubArgParser.getUsage()}\n\n');
 
   // Show the commands sorted.
@@ skipping 123 matching lines @@
       // Explicitly exit on success to ensure that any dangling dart:io handles
       // don't cause the process to never terminate.
       .then((_) => exit(0));
   }
 
   /// Override this to perform the specific command. Return a future that
   /// completes when the command is done or fails if the command fails. If the
   /// command is synchronous, it may return `null`.
   Future onRun();
 
-  /// Displays usage information for this command. 
+  /// Displays usage information for this command.
   void printUsage([String description]) {
     if (description == null) description = this.description;
 
     var buffer = new StringBuffer();
     buffer.add('$description\n\nUsage: $usage');
 
     var commandUsage = commandParser.getUsage();
     if (!commandUsage.isEmpty) {
       buffer.add('\n');
       buffer.add(commandUsage);
     }
 
     log.message(buffer.toString());
   }
 
   /// Returns the appropriate exit code for [exception], falling back on 1 if no
   /// appropriate exit code could be found.
   int _chooseExitCode(exception) {
     if (exception is HttpException || exception is HttpParserException ||
         exception is SocketIOException || exception is PubHttpException) {
       return exit_codes.UNAVAILABLE;
     } else if (exception is FormatException) {
       return exit_codes.DATA;
     } else {
       return 1;
     }
   }
 }