Fixed moving src folder around

Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/570f9222
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/570f9222
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/570f9222

Branch: refs/heads/future
Commit: 570f92222e1151f82d95a01d8993b8189d886c06
Parents: 482acf8
Author: Tim Kim <[email protected]>
Authored: Wed Apr 3 13:46:02 2013 -0700
Committer: Tim Kim <[email protected]>
Committed: Tue Apr 9 14:01:02 2013 -0700

----------------------------------------------------------------------
 util/plugin_loader.js |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/570f9222/util/plugin_loader.js
----------------------------------------------------------------------
diff --git a/util/plugin_loader.js b/util/plugin_loader.js
index 6d55694..b14a640 100644
--- a/util/plugin_loader.js
+++ b/util/plugin_loader.js
@@ -45,7 +45,6 @@ exports.handlePrepare = function(projectRoot, plugins_dir, 
wwwDir, platform) {
     // This array holds all the metadata for each module and ends up in 
cordova_plugins.json
     var moduleObjects = [];
 
-
     plugins && plugins.forEach(function(plugin) {
         var pluginDir = path.join(plugins_dir, plugin);
         var xml = new 
et.ElementTree(et.XML(fs.readFileSync(path.join(pluginDir, 'plugin.xml'), 
'utf-8')));
@@ -56,18 +55,28 @@ exports.handlePrepare = function(projectRoot, plugins_dir, 
wwwDir, platform) {
         var assets = xml.findall('./asset');
         assets && assets.forEach(function(asset) {
             var target = asset.attrib.target;
+           
             var lastSlash = target.lastIndexOf('/');
             var dirname  = lastSlash < 0 ? ''     : target.substring(0, 
lastSlash);
             var basename = lastSlash < 0 ? target : target.substring(lastSlash 
+ 1);
 
             var targetDir = path.join(wwwDir, dirname);
+             
             shell.mkdir('-p', targetDir);
 
             var srcFile = path.join(pluginDir, asset.attrib.src);
             var targetFile = path.join(targetDir, basename);
 
-            var cpOptions = fs.statSync(srcFile).isDirectory() ? '-Rf' : '-f';
+            var cpOptions = '-f';
+            
+            if(fs.statSync(srcFile).isDirectory()){
+                shell.mkdir('-p',targetFile);
+                srcFile = srcFile+'/*';
+                cpOptions = '-Rf';
+            }
+
             shell.cp(cpOptions, [srcFile], targetFile);
+            
         });
 
         // And then add the plugins dir to the platform's www.

Reply via email to