Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38F9A18CF4 for ; Mon, 11 Jan 2016 23:53:08 +0000 (UTC) Received: (qmail 20544 invoked by uid 500); 11 Jan 2016 23:53:08 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 20487 invoked by uid 500); 11 Jan 2016 23:53:07 -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 20478 invoked by uid 99); 11 Jan 2016 23:53:07 -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, 11 Jan 2016 23:53:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BDD4CE0B11; Mon, 11 Jan 2016 23:53:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Message-Id: <5c0657b011cc4f0eb5478c3a0aeaad6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-10105: Spot fix for tilde errors on paths. Date: Mon, 11 Jan 2016 23:53:07 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master 73fd9e4df -> d78ae309f CB-10105: Spot fix for tilde errors on paths. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d78ae309 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d78ae309 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d78ae309 Branch: refs/heads/master Commit: d78ae309f1234cec4f1651a7140508ff1b1dda32 Parents: 73fd9e4 Author: Joe Bowser Authored: Mon Jan 11 15:53:00 2016 -0800 Committer: Joe Bowser Committed: Mon Jan 11 15:53:00 2016 -0800 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d78ae309/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index bbf4bd9..694783f 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -88,11 +88,16 @@ function parseOpts(options, resolvedTarget) { throw new Error('Specified build config file does not exist: ' + buildConfig); } events.emit('log', 'Reading build config file: '+ path.resolve(buildConfig)); - var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8')); + var buildjson = fs.readFileSync(buildConfig, 'utf8'); + //var config = JSON.parse(fs.readFileSync(buildConfig, 'utf8')); + var config = JSON.parse(buildjson); if (config.android && config.android[ret.buildType]) { var androidInfo = config.android[ret.buildType]; if(androidInfo.keystore && !packageArgs.keystore) { + if(androidInfo.keystore.substr(0,1) === '~') + androidInfo.keystore = process.env.HOME + androidInfo.keystore.substr(1) packageArgs.keystore = path.resolve(path.dirname(buildConfig), androidInfo.keystore); + events.emit('log', 'Reading the keystore from: ' + packageArgs.keystore); } ['alias', 'storePassword', 'password','keystoreType'].forEach(function (key){ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org