Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C1896200C4C for ; Mon, 20 Mar 2017 18:51:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C0608160B76; Mon, 20 Mar 2017 17:51:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E9F22160B9B for ; Mon, 20 Mar 2017 18:51:20 +0100 (CET) Received: (qmail 38790 invoked by uid 500); 20 Mar 2017 17:51:20 -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 38095 invoked by uid 99); 20 Mar 2017 17:51:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Mar 2017 17:51:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6013EE0007; Mon, 20 Mar 2017 17:51:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: commits@cordova.apache.org Date: Mon, 20 Mar 2017 17:51:30 -0000 Message-Id: In-Reply-To: <7829924dc7524076a85b5db5c7acd1ae@git.apache.org> References: <7829924dc7524076a85b5db5c7acd1ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/12] android commit: CB-12546: account for quotes when detecting `android` command error for Windows. archived-at: Mon, 20 Mar 2017 17:51:21 -0000 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 Authored: Wed Mar 15 15:35:29 2017 -0700 Committer: filmaj 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