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 AC20F10893 for ; Thu, 5 Dec 2013 23:40:42 +0000 (UTC) Received: (qmail 47320 invoked by uid 500); 5 Dec 2013 23:40:42 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 47270 invoked by uid 500); 5 Dec 2013 23:40:42 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 47192 invoked by uid 99); 5 Dec 2013 23:40:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2013 23:40:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C4D382CB0C; Thu, 5 Dec 2013 23:40:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Thu, 05 Dec 2013 23:40:44 -0000 Message-Id: <42e32e7a9a354001a05b83b3880b917c@git.apache.org> In-Reply-To: <12c326e57caf470fbeb80b4977ab5e1d@git.apache.org> References: <12c326e57caf470fbeb80b4977ab5e1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/23] git commit: CB-5501 fix blackberry10 platform CB-5501 fix blackberry10 platform Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/f7a35b3c Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/f7a35b3c Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/f7a35b3c Branch: refs/heads/ubuntu Commit: f7a35b3ca8a8b787fbbe01aebed286802451b64a Parents: 758d752 Author: Bryan Higgins Authored: Thu Nov 28 14:34:13 2013 -0500 Committer: Bryan Higgins Committed: Thu Nov 28 14:35:00 2013 -0500 ---------------------------------------------------------------------- src/lazy_load.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f7a35b3c/src/lazy_load.js ---------------------------------------------------------------------- diff --git a/src/lazy_load.js b/src/lazy_load.js index e16dd70..dcaa126 100644 --- a/src/lazy_load.js +++ b/src/lazy_load.js @@ -47,7 +47,7 @@ module.exports = { var download_dir = (platform == 'wp7' || platform == 'wp8' ? path.join(util.libDirectory, 'wp', id, version) : path.join(util.libDirectory, platform, id, version)); - var lib_dir = platforms[platform] && platforms[platform].subdirectory ? path.join(download_dir, platforms[platform].subdirectory) : download_dir; + var lib_dir = platforms[platform] && platforms[platform].subdirectory && platform !== "blackberry10" ? path.join(download_dir, platforms[platform].subdirectory) : download_dir; if (fs.existsSync(download_dir)) { events.emit('verbose', id + ' library for "' + platform + '" already exists. No need to download. Continuing.'); @@ -102,7 +102,7 @@ module.exports = { events.emit('log', 'Download complete'); var entries = fs.readdirSync(download_dir); var entry = path.join(download_dir, entries[0]); - shell.mv('-f', path.join(entry, '*'), download_dir); + shell.mv('-f', path.join(entry, (platform=='blackberry10'?'blackberry10':''), '*'), download_dir); shell.rm('-rf', entry); d.resolve(hooker.fire('after_library_download', { platform:platform,