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

Remove redundant check #84

Open
joliss wants to merge 1 commit from joliss/cleanup into master
pull from: joliss/cleanup
merge into: code:master
Conversation 0 Commits 1 Files changed 1 +5 -11
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/wrench.js
View file

@ -231,9 +231,9 @@ exports.copyDirSyncRecursive = function(sourceDir, newDirLocation, opts) {
opts = opts || {}; opts = opts || {};
try { try {
if(fs.statSync(newDirLocation).isDirectory()) { if(fs.statSync(newDirLocation).isDirectory()) {
if(opts.forceDelete) { if(opts.forceDelete) {
exports.rmdirSyncRecursive(newDirLocation); exports.rmdirSyncRecursive(newDirLocation);
} else { } else {
return new Error('You are trying to delete a directory that already exists. Specify forceDelete in the opts argument to override this. Bailing~'); return new Error('You are trying to delete a directory that already exists. Specify forceDelete in the opts argument to override this. Bailing~');
} }
@ -256,15 +256,9 @@ exports.copyDirSyncRecursive = function(sourceDir, newDirLocation, opts) {
for(var i = 0; i < files.length; i++) { for(var i = 0; i < files.length; i++) {
// ignores all files or directories which match the RegExp in opts.filter // ignores all files or directories which match the RegExp in opts.filter
if(typeof opts !== 'undefined') { if (hasFilter && !isFileIncluded(opts, sourceDir, files[i])) continue;
if (hasFilter) {
if (!isFileIncluded(opts, sourceDir, files[i])) { if (opts.excludeHiddenUnix && /^\./.test(files[i])) continue;
continue;
}
}
if (opts.excludeHiddenUnix && /^\./.test(files[i])) continue;
}
var currFile = fs.lstatSync(_path.join(sourceDir, files[i])); var currFile = fs.lstatSync(_path.join(sourceDir, files[i]));