Merge 5c0831ef43 into 31cf44b999
This commit is contained in:
commit
35514fe732
1 changed files with 5 additions and 3 deletions
|
|
@ -188,10 +188,10 @@ 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(typeof opts !== 'undefined') {
|
||||||
if(!opts.whitelist && opts.filter && files[i].match(opts.filter)) continue;
|
if(!opts.whitelist && opts.filter && files[i].match(opts.filter)) continue;
|
||||||
// if opts.whitelist is true every file or directory which doesn't match opts.filter will be ignored
|
// if opts.whitelist is true every file or directory which doesn't match opts.filter will be ignored
|
||||||
if(opts.whitelist && opts.filter && !files[i].match(opts.filter)) continue;
|
if(opts.whitelist && opts.filter && !files[i].match(opts.filter)) continue;
|
||||||
if (opts.excludeHiddenUnix && /^\./.test(files[i])) continue;
|
if (opts.excludeHiddenUnix && /^\./.test(files[i])) continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -199,6 +199,8 @@ exports.copyDirSyncRecursive = function(sourceDir, newDirLocation, opts) {
|
||||||
|
|
||||||
var fCopyFile = function(srcFile, destFile) {
|
var fCopyFile = function(srcFile, destFile) {
|
||||||
if(typeof opts !== 'undefined' && opts.preserveFiles && fs.existsSync(destFile)) return;
|
if(typeof opts !== 'undefined' && opts.preserveFiles && fs.existsSync(destFile)) return;
|
||||||
|
// if opts.ignoreFiles is true every file will be ignored
|
||||||
|
if(typeof opts !== 'undefined' && opts.ignoreFiles) return;
|
||||||
|
|
||||||
var contents = fs.readFileSync(srcFile);
|
var contents = fs.readFileSync(srcFile);
|
||||||
fs.writeFileSync(destFile, contents);
|
fs.writeFileSync(destFile, contents);
|
||||||
|
|
|
||||||
Reference in a new issue