From c8475a199eb1d894a9fc4b66944ccd5973df8787 Mon Sep 17 00:00:00 2001 From: Ryan McGrath Date: Fri, 3 May 2013 16:54:06 -0400 Subject: [PATCH] Bit of args switching to keep old users in running order --- lib/wrench.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/wrench.js b/lib/wrench.js index 297d28d..bb1f4b5 100644 --- a/lib/wrench.js +++ b/lib/wrench.js @@ -288,9 +288,14 @@ exports.chownSyncRecursive = function(sourceDir, uid, gid) { * * Recursively dives through directories and obliterates everything about it. */ -exports.rmdirRecursive = function rmdirRecursive(dir, clbk){ +exports.rmdirRecursive = function rmdirRecursive(dir, failSilent, clbk){ fs.readdir(dir, function(err, files){ - if (err) return clbk(err); + if(err && typeof failSilent === 'boolean' && !failSilent) + return clbk(err); + + if(typof failSilent === 'function') + clbk = failSilent; + (function rmFile(err){ if (err) return clbk(err); @@ -328,6 +333,9 @@ exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, opts, clbk) return clbk(new Error('You are trying to delete a directory that already exists. Specify forceDelete in an options object to override this.')); } + if(typeof opts === 'function') + clbk = opts; + fs.stat(srcDir, function(err, srcDirStat){ if (err) return clbk(err); fs.mkdir(newDir, srcDirStat.mode, function(err){