Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD3AF1061B for ; Tue, 16 Dec 2014 19:19:13 +0000 (UTC) Received: (qmail 6640 invoked by uid 500); 16 Dec 2014 19:19:13 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 6614 invoked by uid 500); 16 Dec 2014 19:19:13 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 6605 invoked by uid 99); 16 Dec 2014 19:19:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 19:19:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 54C77A2D287; Tue, 16 Dec 2014 19:19:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Tue, 16 Dec 2014 19:19:11 -0000 Message-Id: <8b3a211faa4d48ea9b0e5ca19310a0b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] android commit: CB-8176 Update Android SDK search path for Android Studio 1.0 Repository: cordova-android Updated Branches: refs/heads/4.0.x f086ef5ca -> 162fc0720 CB-8176 Update Android SDK search path for Android Studio 1.0 Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/342bbaa3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/342bbaa3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/342bbaa3 Branch: refs/heads/4.0.x Commit: 342bbaa3ae735a01f3ca57169c98206844380c0a Parents: 56a3ee5 Author: Andrew Grieve Authored: Tue Dec 16 14:17:55 2014 -0500 Committer: Andrew Grieve Committed: Tue Dec 16 14:17:55 2014 -0500 ---------------------------------------------------------------------- bin/lib/check_reqs.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/342bbaa3/bin/lib/check_reqs.js ---------------------------------------------------------------------- diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index 0b87bab..6c2ec16 100644 --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@ -156,20 +156,26 @@ module.exports.check_android = function() { } if (!hasAndroidHome && !androidCmdPath) { if (isWindows) { - // Android Studio installer. + // Android Studio 1.0 installer + maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk')); + maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'sdk')); + // Android Studio pre-1.0 installer maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-studio', 'sdk')); maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-studio', 'sdk')); - // Stand-alone installer. + // Stand-alone installer maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-sdk')); maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-sdk')); } else if (process.platform == 'darwin') { + // Android Studio 1.0 installer + maybeSetAndroidHome(path.join(process.env['HOME'], 'Library', 'Android', 'sdk')); + // Android Studio pre-1.0 installer maybeSetAndroidHome('/Applications/Android Studio.app/sdk'); // Stand-alone zip file that user might think to put under /Applications maybeSetAndroidHome('/Applications/android-sdk-macosx'); maybeSetAndroidHome('/Applications/android-sdk'); } if (process.env['HOME']) { - // or their HOME directory. + // Stand-alone zip file that user might think to put under their home directory maybeSetAndroidHome(path.join(process.env['HOME'], 'android-sdk-macosx')); maybeSetAndroidHome(path.join(process.env['HOME'], 'android-sdk')); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org