You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2017/03/20 17:51:30 UTC
[12/12] android commit: CB-12546: account for quotes when detecting
`android` command error for Windows.
CB-12546: account for quotes when detecting `android` command error for Windows.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2f2e8a56
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2f2e8a56
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2f2e8a56
Branch: refs/heads/master
Commit: 2f2e8a560d3ef0cf9d82931bb511f19ce044f58a
Parents: 8848189
Author: filmaj <ma...@gmail.com>
Authored: Wed Mar 15 15:35:29 2017 -0700
Committer: filmaj <ma...@gmail.com>
Committed: Mon Mar 20 10:09:46 2017 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/android_sdk.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2f2e8a56/bin/templates/cordova/lib/android_sdk.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/android_sdk.js b/bin/templates/cordova/lib/android_sdk.js
index 692e7df..58d301e 100755
--- a/bin/templates/cordova/lib/android_sdk.js
+++ b/bin/templates/cordova/lib/android_sdk.js
@@ -122,7 +122,7 @@ module.exports.list_targets = function() {
.catch(function(err) {
// there's a chance `android` no longer works.
// lets see if `sdkmanager` is available and we can figure it out
- var avail_regex = /android command is no longer available/;
+ var avail_regex = /"?android"? command is no longer available/;
if (err.code && ((err.stdout && err.stdout.match(avail_regex)) || (err.stderr && err.stderr.match(avail_regex)))) {
return module.exports.list_targets_with_sdkmanager();
} else throw err;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org