You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/08/20 17:20:23 UTC
android commit: CB-7325 Fix error message in android_sdk_version.js
when missing SDK on windows
Repository: cordova-android
Updated Branches:
refs/heads/master 71e72f215 -> 94943a9a8
CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows
github: close #113
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/94943a9a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/94943a9a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/94943a9a
Branch: refs/heads/master
Commit: 94943a9a84546dff5f4416115572b92bd9781fac
Parents: 71e72f2
Author: Refael Ackermann <re...@empeeric.com>
Authored: Mon Aug 18 14:53:07 2014 +0300
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Aug 20 11:20:02 2014 -0400
----------------------------------------------------------------------
bin/lib/android_sdk_version.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/94943a9a/bin/lib/android_sdk_version.js
----------------------------------------------------------------------
diff --git a/bin/lib/android_sdk_version.js b/bin/lib/android_sdk_version.js
index d03e1e7..e592378 100755
--- a/bin/lib/android_sdk_version.js
+++ b/bin/lib/android_sdk_version.js
@@ -51,7 +51,7 @@ get_sdks = function() {
return Q();
}, function(stderr) {
- if (stderr.match(/command\snot\sfound/)) {
+ if (stderr.match(/command\snot\sfound/) || stderr.match(/'android' is not recognized/)) {
return Q.reject(new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.'));
} else {
return Q.reject(new Error('An error occurred while listing Android targets'));