cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject [1/4] android commit: CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows
Date Wed, 20 Aug 2014 15:49:07 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/4.0.x 4c1942e3f -> 7caa96abc


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/4.0.x
Commit: 94943a9a84546dff5f4416115572b92bd9781fac
Parents: 71e72f2
Author: Refael Ackermann <refael@empeeric.com>
Authored: Mon Aug 18 14:53:07 2014 +0300
Committer: Andrew Grieve <agrieve@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'));


Mime
View raw message