From commits-return-51086-archive-asf-public=cust-asf.ponee.io@cordova.apache.org Tue Jan 9 10:50:38 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id BFBEA180718 for ; Tue, 9 Jan 2018 10:50:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AFABC160C2D; Tue, 9 Jan 2018 09:50:38 +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 F29AD160C13 for ; Tue, 9 Jan 2018 10:50:37 +0100 (CET) Received: (qmail 48844 invoked by uid 500); 9 Jan 2018 09:50:37 -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 48835 invoked by uid 99); 9 Jan 2018 09:50:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jan 2018 09:50:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A950C84A39; Tue, 9 Jan 2018 09:50:35 +0000 (UTC) Date: Tue, 09 Jan 2018 09:50:35 +0000 To: "commits@cordova.apache.org" Subject: [cordova-paramedic] branch master updated: Fixed Android apk not being found (for reals this time) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151549143564.2040.4036329120241204001@gitbox.apache.org> From: alsorokin@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cordova-paramedic X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e43017c23647eb136d5b2f97f3321ea48908722b X-Git-Newrev: 0e90d836f6871b28a0f1b5ce4a5c9432a709a949 X-Git-Rev: 0e90d836f6871b28a0f1b5ce4a5c9432a709a949 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. alsorokin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cordova-paramedic.git The following commit(s) were added to refs/heads/master by this push: new 0e90d83 Fixed Android apk not being found (for reals this time) 0e90d83 is described below commit 0e90d836f6871b28a0f1b5ce4a5c9432a709a949 Author: Alexander Sorokin AuthorDate: Tue Jan 9 12:50:29 2018 +0300 Fixed Android apk not being found (for reals this time) --- lib/paramedic.js | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/paramedic.js b/lib/paramedic.js index 24ad808..41a12b3 100644 --- a/lib/paramedic.js +++ b/lib/paramedic.js @@ -666,7 +666,7 @@ ParamedicRunner.prototype.getPackageFolders = function () { var packageFolders; switch (this.config.getPlatformId()) { case util.ANDROID: - packageFolders = [ path.join(this.tempFolder.name, 'platforms/android/app/build/outputs/apk'), + packageFolders = [ path.join(this.tempFolder.name, 'platforms/android/app/build/outputs/apk/debug'), path.join(this.tempFolder.name, 'platforms/android/build/outputs/apk') ]; break; case util.IOS: @@ -693,26 +693,11 @@ ParamedicRunner.prototype.getPackageName = function () { return packageName; }; -ParamedicRunner.prototype.getBinaryDir = function () { - var binaryPath; - switch (this.config.getPlatformId()) { - case util.ANDROID: - binaryPath = path.join(this.tempFolder.name, 'platforms/android/build/outputs/apk'); - break; - case util.IOS: - binaryPath = path.join(this.tempFolder.name, 'platforms/ios/build/emulator/'); - break; - default: - throw new Error('Don\'t know the binary folder for platform: ' + this.config.getPlatformId()); - } - return binaryPath; -}; - ParamedicRunner.prototype.getBinaryName = function () { var binaryName; switch (this.config.getPlatformId()) { case util.ANDROID: - shell.pushd(this.getBinaryDir()); + shell.pushd(this.getPackageFolder()); var apks = shell.ls('*debug.apk'); if (apks.length > 0) { binaryName = apks.reduce(function (previous, current) { -- To stop receiving notification emails like this one, please contact ['"commits@cordova.apache.org" ']. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org