From fb18ccd50e25246d039ffdcbae59db9ce0cff316 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Fri, 26 Feb 2016 22:34:29 -0800 Subject: [PATCH 1/4] CB-10673 fixed conflicting plugin install issue with overlapped tag --- template/cordova/lib/PluginHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js index 27726ea7..41974251 100644 --- a/template/cordova/lib/PluginHandler.js +++ b/template/cordova/lib/PluginHandler.js @@ -36,7 +36,7 @@ var handlers = { 'source-file': { install:function(obj, plugin, project, options) { var dest = path.join('plugins', plugin.id, obj.targetDir || '', path.basename(obj.src)); - copyNewFile(plugin.dir, obj.src, project.root, dest); + copyFile(plugin.dir, obj.src, project.root, dest); // add reference to this file to jsproj. project.addSourceFile(dest); }, From 73da0e419fedd15595d348b0953f18f334732a21 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Sat, 27 Feb 2016 17:48:06 -0800 Subject: [PATCH 2/4] CB--10673 fixed jshint error --- template/cordova/lib/PluginHandler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js index 41974251..8655011a 100644 --- a/template/cordova/lib/PluginHandler.js +++ b/template/cordova/lib/PluginHandler.js @@ -207,7 +207,7 @@ function copyFile (plugin_dir, src, project_dir, dest, link) { shell.cp('-f', src, dest); } } - +/* // Same as copy file but throws error if target exists function copyNewFile (plugin_dir, src, project_dir, dest, link) { var target_path = path.resolve(project_dir, dest); @@ -216,7 +216,7 @@ function copyNewFile (plugin_dir, src, project_dir, dest, link) { copyFile(plugin_dir, src, project_dir, dest, !!link); } - +*/ // checks if file exists and then deletes. Error if doesn't exist function removeFile (project_dir, src) { var file = path.resolve(project_dir, src); From b967ccb73aa584da7059eb47c9bec07cd97dc3e3 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Wed, 2 Mar 2016 22:07:56 -0800 Subject: [PATCH 3/4] CB-10673 force copying on --force-copying-src --- template/cordova/lib/PluginHandler.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js index 8655011a..44d6d348 100644 --- a/template/cordova/lib/PluginHandler.js +++ b/template/cordova/lib/PluginHandler.js @@ -36,7 +36,11 @@ var handlers = { 'source-file': { install:function(obj, plugin, project, options) { var dest = path.join('plugins', plugin.id, obj.targetDir || '', path.basename(obj.src)); - copyFile(plugin.dir, obj.src, project.root, dest); + if (options && options.forceCopyingSrc) { + copyFile(plugin.dir, obj.src, project.root, dest); + } else { + copyNewFile(plugin.dir, obj.src, project.root, dest); + } // add reference to this file to jsproj. project.addSourceFile(dest); }, @@ -207,7 +211,7 @@ function copyFile (plugin_dir, src, project_dir, dest, link) { shell.cp('-f', src, dest); } } -/* + // Same as copy file but throws error if target exists function copyNewFile (plugin_dir, src, project_dir, dest, link) { var target_path = path.resolve(project_dir, dest); @@ -216,7 +220,7 @@ function copyNewFile (plugin_dir, src, project_dir, dest, link) { copyFile(plugin_dir, src, project_dir, dest, !!link); } -*/ + // checks if file exists and then deletes. Error if doesn't exist function removeFile (project_dir, src) { var file = path.resolve(project_dir, src); From 839f34388d7cee1336fbd711cf5205cc396a8ba1 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Thu, 3 Mar 2016 23:12:11 -0800 Subject: [PATCH 4/4] CB-10673 changed the option name to --force --- template/cordova/lib/PluginHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js index 44d6d348..4e031f6b 100644 --- a/template/cordova/lib/PluginHandler.js +++ b/template/cordova/lib/PluginHandler.js @@ -36,7 +36,7 @@ var handlers = { 'source-file': { install:function(obj, plugin, project, options) { var dest = path.join('plugins', plugin.id, obj.targetDir || '', path.basename(obj.src)); - if (options && options.forceCopyingSrc) { + if (options && options.force) { copyFile(plugin.dir, obj.src, project.root, dest); } else { copyNewFile(plugin.dir, obj.src, project.root, dest);