repos/wrench-js
Archived
1
Fork 0
Code Issues 22 Pull requests 7 Projects Releases Packages Wiki Activity Actions

bug fixing

Browse source
This commit is contained in:
defrex 2011-04-28 18:42:02 -04:00
parent e9991ed62c
commit 5b71715d88
1 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

59
lib/wrench.js
View file

@ -120,25 +120,23 @@ exports.chmodSyncRecursive = function(sourceDir, filemode) {
*/ */
exports.rmdirRecursive = function rmdirRecursive(dir, clbk){ exports.rmdirRecursive = function rmdirRecursive(dir, clbk){
fs.readdir(dir, function(err, files){ fs.readdir(dir, function(err, files){
if (err) return clbk(); if (err) return clbk(err);
var called = 0; (function rmFile(err){
var done = function(){ if (err) return clbk(err);
if (called == files.length)
fs.rmdir(dir, clbk); var filename = files.shift();
else if (filename === null || typeof filename == 'undefined')
called++; return fs.rmdir(dir, clbk);
};
done(); var file = dir+'/'+filename;
files.forEach(function(f){ fs.stat(file, function(err, stat){
f = dir+f; if (err) return clbk(err);
fs.stat(f, function(err, stat){
if (err) return done();
if (stat.isDirectory()) if (stat.isDirectory())
rmdirRecursive(f, done); rmdirRecursive(file, rmFile);
else else
fs.unlink(f, done); fs.unlink(file, rmFile);
});
}); });
})();
}); });
}; };
@ -151,7 +149,7 @@ exports.rmdirRecursive = function rmdirRecursive(dir, clbk){
*/ */
exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, clbk) { exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, clbk) {
fs.stat(newDir, function(err, newDirStat){ fs.stat(newDir, function(err, newDirStat){
if (!err) return exports.rmdirRecursive(newDir, function(){ if (!err) return exports.rmdirRecursive(newDir, function(err){
copyDirRecursive(srcDir, newDir, clbk); copyDirRecursive(srcDir, newDir, clbk);
}); });
@ -161,32 +159,29 @@ exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, clbk) {
if (err) return clbk(err); if (err) return clbk(err);
fs.readdir(srcDir, function(err, files){ fs.readdir(srcDir, function(err, files){
if (err) return clbk(err); if (err) return clbk(err);
var called = 0; (function copyFiles(err){
var done = function(err){
if (err) return clbk(err); if (err) return clbk(err);
if (called == files.length)
clbk(); var filename = files.shift();
else if (filename === null || typeof filename == 'undefined')
called++; return clbk();
};
done();
files.forEach(function(filename){
var file = srcDir+'/'+filename, var file = srcDir+'/'+filename,
newFile = newDir+'/'+filename, newFile = newDir+'/'+filename;
called = 0;
fs.stat(file, function(err, fileStat){ fs.stat(file, function(err, fileStat){
if (fileStat.isDirectory()) if (fileStat.isDirectory())
copyDirRecursive(file, newFile, done); copyDirRecursive(file, newFile, copyFiles);
else if (fileStat.isSymbolicLink()) else if (fileStat.isSymbolicLink())
fs.readlink(file, function(err, link){ fs.readlink(file, function(err, link){
fs.symlink(link, newFile, done); fs.symlink(link, newFile, copyFiles);
}); });
else else
fs.readFile(file, function(err, data){ fs.readFile(file, function(err, data){
fs.writeFile(newFile, data, done); fs.writeFile(newFile, data, copyFiles);
});
}); });
}); });
})();
}); });
}); });
}); });