Commit 67f59100 authored by Adam Barth's avatar Adam Barth Committed by GitHub

Mentions `flutter packages get` rather than `pub get` (#6625)

Fixes #6417
parent 8f2d40c2
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/calculator/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/calculator/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/packages" />
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/packages" />
</content> </content>
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/bin/packages" /> <excludeFolder url="file://$MODULE_DIR$/bin/packages" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/animation/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/animation/packages" />
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/src/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/src/packages" />
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/packages" /> <excludeFolder url="file://$MODULE_DIR$/example/packages" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/packages" />
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/packages" /> <excludeFolder url="file://$MODULE_DIR$/packages" />
<excludeFolder url="file://$MODULE_DIR$/test/packages" /> <excludeFolder url="file://$MODULE_DIR$/test/packages" />
</content> </content>
......
...@@ -19,7 +19,7 @@ class CreateCommand extends FlutterCommand { ...@@ -19,7 +19,7 @@ class CreateCommand extends FlutterCommand {
CreateCommand() { CreateCommand() {
argParser.addFlag('pub', argParser.addFlag('pub',
defaultsTo: true, defaultsTo: true,
help: 'Whether to run "pub get" after the project has been created.' help: 'Whether to run "flutter packages get" after the project has been created.'
); );
argParser.addFlag( argParser.addFlag(
'with-driver-test', 'with-driver-test',
......
...@@ -18,7 +18,7 @@ class UpdatePackagesCommand extends FlutterCommand { ...@@ -18,7 +18,7 @@ class UpdatePackagesCommand extends FlutterCommand {
UpdatePackagesCommand({ this.hidden: false }) { UpdatePackagesCommand({ this.hidden: false }) {
argParser.addFlag( argParser.addFlag(
'upgrade', 'upgrade',
help: 'Run "pub upgrade" rather than "pub get".', help: 'Ignores pubspec.lock and retrieves newer versions of packages.',
defaultsTo: false defaultsTo: false
); );
} }
......
...@@ -41,7 +41,7 @@ class PackageMap { ...@@ -41,7 +41,7 @@ class PackageMap {
String message = '$packagesPath does not exist.'; String message = '$packagesPath does not exist.';
String pubspecPath = path.absolute(path.dirname(packagesPath), 'pubspec.yaml'); String pubspecPath = path.absolute(path.dirname(packagesPath), 'pubspec.yaml');
if (FileSystemEntity.isFileSync(pubspecPath)) if (FileSystemEntity.isFileSync(pubspecPath))
message += '\nDid you run `pub get` in this directory?'; message += '\nDid you run "flutter packages get" in this directory?';
else else
message += '\nDid you run this command from the same directory as your pubspec.yaml file?'; message += '\nDid you run this command from the same directory as your pubspec.yaml file?';
return message; return message;
......
...@@ -46,7 +46,7 @@ Future<int> pubGet({ ...@@ -46,7 +46,7 @@ Future<int> pubGet({
if (!checkLastModified || _shouldRunPubGet(pubSpecYaml: pubSpecYaml, dotPackages: dotPackages)) { if (!checkLastModified || _shouldRunPubGet(pubSpecYaml: pubSpecYaml, dotPackages: dotPackages)) {
String command = upgrade ? 'upgrade' : 'get'; String command = upgrade ? 'upgrade' : 'get';
Status status = logger.startProgress("Running 'pub $command' in ${path.basename(directory)}..."); Status status = logger.startProgress("Running 'flutter packages $command' in ${path.basename(directory)}...");
int code = await runCommandAndStreamOutput( int code = await runCommandAndStreamOutput(
<String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-packages-dir', '--no-precompile'], <String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-packages-dir', '--no-precompile'],
workingDirectory: directory, workingDirectory: directory,
......
...@@ -57,7 +57,7 @@ abstract class FlutterCommand extends Command { ...@@ -57,7 +57,7 @@ abstract class FlutterCommand extends Command {
void usesPubOption() { void usesPubOption() {
argParser.addFlag('pub', argParser.addFlag('pub',
defaultsTo: true, defaultsTo: true,
help: 'Whether to run "pub get" before executing this command.'); help: 'Whether to run "flutter packages get" before executing this command.');
_usesPubOption = true; _usesPubOption = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment