DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent flutter create from running inside SDK (#6587)

Browse Source 
Fixes #6480
This commit is contained in:
Adam Barth 2016-10-28 20:29:19 -07:00 committed by GitHub
parent 0288390814
commit 030f623a84
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/flutter_tools/lib/src/commands/create.dart
View File

@ -91,13 +91,15 @@ class CreateCommand extends FlutterCommand {
String relativePath = path.relative(dirPath);
String projectName = _normalizeProjectName(path.basename(dirPath));
if (_validateProjectDir(dirPath) != null) {
printError(_validateProjectDir(dirPath));
String error =_validateProjectDir(dirPath, flutterRoot: flutterRoot);
if (error != null) {
printError(error);
return 1;
}
if (_validateProjectName(projectName) != null) {
printError(_validateProjectName(projectName));
error = _validateProjectName(projectName);
if (error != null) {
printError(error);
return 1;
}
@ -242,17 +244,22 @@ String _validateProjectName(String projectName) {
/// Return `null` if the project directory is legal. Return a validation message
/// if we should disallow the directory name.
String _validateProjectDir(String projectName) {
FileSystemEntityType type = FileSystemEntity.typeSync(projectName);
String _validateProjectDir(String dirPath, { String flutterRoot }) {
if (path.isWithin(flutterRoot, dirPath)) {
return "Cannot create a project within the Flutter SDK.\n"
"Target directory '$dirPath' is within the Flutter SDK at '$flutterRoot'.";
}
FileSystemEntityType type = FileSystemEntity.typeSync(dirPath);
if (type != FileSystemEntityType.NOT_FOUND) {
switch(type) {
case FileSystemEntityType.FILE:
// Do not overwrite files.
return "Invalid project name: '$projectName' - file exists.";
return "Invalid project name: '$dirPath' - file exists.";
case FileSystemEntityType.LINK:
// Do not overwrite links.
return "Invalid project name: '$projectName' - refers to a link.";
return "Invalid project name: '$dirPath' - refers to a link.";
}
}