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 6F5C010B16 for ; Thu, 19 Sep 2013 19:48:34 +0000 (UTC) Received: (qmail 37293 invoked by uid 500); 19 Sep 2013 19:48:34 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 37153 invoked by uid 500); 19 Sep 2013 19:48:33 -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 37134 invoked by uid 99); 19 Sep 2013 19:48:32 -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, 19 Sep 2013 19:48:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 712F38A3032; Thu, 19 Sep 2013 19:48:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Thu, 19 Sep 2013 19:48:33 -0000 Message-Id: <16e40f304429438d8c01c1e19e1d50e2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] android commit: Fix update script to clobber cordova.js file (missing -f) Fix update script to clobber cordova.js file (missing -f) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4441215e Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4441215e Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4441215e Branch: refs/heads/3.1.x Commit: 4441215e4c3e7a73fb46ca7b8bbce17aef29ef2d Parents: 734d4d3 Author: Andrew Grieve Authored: Thu Sep 19 15:47:49 2013 -0400 Committer: Andrew Grieve Committed: Thu Sep 19 15:48:15 2013 -0400 ---------------------------------------------------------------------- bin/lib/create.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4441215e/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/bin/lib/create.js b/bin/lib/create.js index 1cd5cc6..8d597ea 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -65,14 +65,14 @@ function ensureJarIsBuilt(version, target_api) { } function copyJsAndJar(projectPath, version) { - shell.cp(path.join(ROOT, 'framework', 'assets', 'www', 'cordova.js'), path.join(projectPath, 'assets', 'www', 'cordova.js')); + shell.cp('-f', path.join(ROOT, 'framework', 'assets', 'www', 'cordova.js'), path.join(projectPath, 'assets', 'www', 'cordova.js')); // Don't fail if there are no old jars. setShellFatal(false, function() { shell.ls(path.join(projectPath, 'libs', 'cordova-*.jar')).forEach(function(oldJar) { shell.rm('-f', path.join(projectPath, 'libs', oldJar)); }); }); - shell.cp(path.join(ROOT, 'framework', 'cordova-' + version + '.jar'), path.join(projectPath, 'libs', 'cordova-' + version + '.jar')); + shell.cp('-f', path.join(ROOT, 'framework', 'cordova-' + version + '.jar'), path.join(projectPath, 'libs', 'cordova-' + version + '.jar')); } function copyScripts(projectPath) {