From 5fb913d00088a9df8ea0816c523a6558d271dd25 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Wed, 22 Jul 2015 16:45:49 +0300 Subject: [PATCH] CB-9397 Fixes minor issues with `cordova requirements android` (cherry picked from commit d99a21eb8debecb9e247c60365a28632a365efb6) --- bin/lib/check_reqs.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index 0b31a2a3..ffa35b65 100644 --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@ -82,9 +82,13 @@ module.exports.check_ant = function() { // Returns a promise. Called only by build and clean commands. module.exports.check_gradle = function() { var sdkDir = process.env['ANDROID_HOME']; + if (!sdkDir) + return Q.reject('Could not find gradle wrapper within Android SDK. Could not find Android SDK directory.\n' + + 'Might need to install Android SDK or set up \'ANDROID_HOME\' env variable.'); + var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper'); if (!fs.existsSync(wrapperDir)) { - return Q.reject(new Error('Could not find gradle wrapper within android sdk. Might need to update your Android SDK.\n' + + return Q.reject(new Error('Could not find gradle wrapper within Android SDK. Might need to update your Android SDK.\n' + 'Looked here: ' + wrapperDir)); } return Q.when(); @@ -312,7 +316,7 @@ module.exports.check_all = function() { requirement.installed = true; requirement.metadata.version = version; }, function (err) { - requirement.metadata.reason = err; + requirement.metadata.reason = err instanceof Error ? err.message : err; }); }, Q()) .then(function () {