You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/09/19 21:48:33 UTC
[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 <ag...@chromium.org>
Authored: Thu Sep 19 15:47:49 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
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) {