diff --git a/lib/agent/actions/wipe/index.js b/lib/agent/actions/wipe/index.js index 721679536..8625d05b8 100644 --- a/lib/agent/actions/wipe/index.js +++ b/lib/agent/actions/wipe/index.js @@ -93,7 +93,7 @@ exports.start = function(opts, cb) { child.stdout.on('data', function(str) { var lines = str.toString().split(/\n/); lines.forEach(function(line) { - if (line.toString().match('File removed')) { + if (line.toString().match('Removing directory')) { logger.warn(line.trim()); removed++; } else if (line.toString().match('Error while removing dir')) { @@ -116,13 +116,13 @@ exports.start = function(opts, cb) { } var finished = function(err) { - logger.warn('Process finished! ' + removed + ' files removed.'); + logger.warn('Process finished! ' + removed + ' dir(s) removed.'); if (!emitter) return; // if no files were removed, treat that as an error if (!err && removed == 0) { - emitter.emit('end', new Error('No files were removed.')); + emitter.emit('end', new Error('No dirs were removed.')); } else { emitter.emit('end', err, { files_removed: removed }); } diff --git a/lib/agent/actions/wipe/linux/wipe-linux b/lib/agent/actions/wipe/linux/wipe-linux index 0628e1c32..e49f538ce 100755 Binary files a/lib/agent/actions/wipe/linux/wipe-linux and b/lib/agent/actions/wipe/linux/wipe-linux differ diff --git a/lib/agent/actions/wipe/mac/wipe-osx b/lib/agent/actions/wipe/mac/wipe-osx index 0e30dbc47..7e1f24abe 100755 Binary files a/lib/agent/actions/wipe/mac/wipe-osx and b/lib/agent/actions/wipe/mac/wipe-osx differ diff --git a/lib/agent/actions/wipe/windows/wipe-win.exe b/lib/agent/actions/wipe/windows/wipe-win.exe old mode 100755 new mode 100644 index 8d1172b76..3f5f4d0bb Binary files a/lib/agent/actions/wipe/windows/wipe-win.exe and b/lib/agent/actions/wipe/windows/wipe-win.exe differ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0cc983d62..35a8a30ca 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -542,8 +542,8 @@ }, "remover": { "version": "0.1.2", - "from": "git://github.com/javo/remover.git#e4f53b0cc0d997e958a45f774fe8732e6a22206", - "resolved": "git://github.com/javo/remover.git#e4f53b0cc0d997e958a45f774fe8732e6a22206" + "from": "git://github.com/javo/remover.git#e640e878ad04b40c57b43555ad5409787384043c", + "resolved": "git://github.com/javo/remover.git#e640e878ad04b40c57b43555ad5409787384043c" }, "reply": { "version": "0.3.1",