Support both new and old style package layouts.

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('../../pkg/args/args.dart');
@@ skipping 34 matching lines @@
  * The parser for arguments that are global to Pub rather than specific to a
  * single command.
  */
 ArgParser get pubArgParser {
   var parser = new ArgParser();
   parser.addFlag('help', abbr: 'h', negatable: false,
     help: 'Prints this usage information');
   parser.addFlag('version', negatable: false,
     help: 'Prints the version of Pub');
   parser.addFlag('trace', help: 'Prints a stack trace when an error occurs');
-  parser.addFlag('self-link', help: 'Temporary flag, do not use.');
   return parser;
 }
 
 main() {
   var globalOptions;
   try {
     globalOptions = pubArgParser.parse(new Options().arguments);
   } on FormatException catch (e) {
     printUsage(description: e.message);
     return;
   }
 
   if (globalOptions['version']) {
     printVersion();
     return;
   }
 
   if (globalOptions['help'] || globalOptions.rest.isEmpty()) {
     printUsage();
     return;
   }
 
-  // TODO(rnystrom): Get rid of this flag (and make the default be true) when
-  // #4820 is fixed and the Editor can handle recursive symlinks.
-  if (globalOptions['self-link']) {
-    Entrypoint.installSelfLink = true;
-  }
-
   // 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 {
     // TODO(nweiz): Choose a better default for Windows.
     cacheDir = '${Platform.environment['HOME']}/.pub-cache';
   }
@@ skipping 144 matching lines @@
     print('');
     print('Usage: $usage');
 
     var commandUsage = commandParser.getUsage();
     if (!commandUsage.isEmpty()) {
       print('');
       print(commandUsage);
     }
   }
 }