From 74446d78fce7df34d412f1ad2f3ac9bb99a89ee3 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 22 Aug 2016 14:35:19 -0700 Subject: [PATCH] don't resolve symlinks as part of which (#5531) * don't resolve symlinks as part of which * update method dartdoc --- packages/flutter_tools/lib/src/android/android_sdk.dart | 4 ++++ packages/flutter_tools/lib/src/base/os.dart | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart index 3ac5b212fc8..ea9c9137967 100644 --- a/packages/flutter_tools/lib/src/android/android_sdk.dart +++ b/packages/flutter_tools/lib/src/android/android_sdk.dart @@ -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); diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart index 729f1d45db8..7c60b5e69d8 100644 --- a/packages/flutter_tools/lib/src/base/os.dart +++ b/packages/flutter_tools/lib/src/base/os.dart @@ -54,15 +54,15 @@ class _PosixUtils extends OperatingSystemUtils { return Process.runSync('chmod', ['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', [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