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

don't resolve symlinks as part of which (#5531)

Browse Source 
* don't resolve symlinks as part of which

* update method dartdoc
This commit is contained in:
Devon Carew 2016-08-22 14:35:19 -07:00 committed by GitHub
parent 40f2b7bddb
commit 74446d78fc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/android/android_sdk.dart
View File

@ -78,6 +78,8 @@ class AndroidSdk {
File aaptBin = os.which('aapt'); // in build-tools/$version/aapt
if (aaptBin != null) {
// Make sure we're using the aapt from the SDK.
aaptBin = new File(aaptBin.resolveSymbolicLinksSync());
String dir = aaptBin.parent.parent.parent.path;
if (validSdkDirectory(dir))
return new AndroidSdk(dir);
@ -85,6 +87,8 @@ class AndroidSdk {
File adbBin = os.which('adb'); // in platform-tools/adb
if (adbBin != null) {
// Make sure we're using the adb from the SDK.
adbBin = new File(adbBin.resolveSymbolicLinksSync());
String dir = adbBin.parent.parent.path;
if (validSdkDirectory(dir))
return new AndroidSdk(dir);

6
packages/flutter_tools/lib/src/base/os.dart
View File

@ -54,15 +54,15 @@ class _PosixUtils extends OperatingSystemUtils {
return Process.runSync('chmod', <String>['a+x', file.path]);
}
/// Return the path (with symlinks resolved) to the given executable, or `null`
/// if `which` was not able to locate the binary.
/// Return the path to the given executable, or `null` if `which` was not able
/// to locate the binary.
@override
File which(String execName) {
ProcessResult result = Process.runSync('which', <String>[execName]);
if (result.exitCode != 0)
return null;
String path = result.stdout.trim().split('\n').first.trim();
return new File(new File(path).resolveSymbolicLinksSync());
return new File(path);
}
// unzip -o -q zipfile -d dest