bugfix fs.move() moving directory across device. Closes #108

jprichardson · Jan 28, 2015 · fbcb042 · fbcb042
1 parent c28fff8
commit fbcb042
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 0.16.0 / 2015-01-**
 -------------------
 - bugfix `fs.move()` into itself. Closes #104
+- bugfix `fs.move()` moving directory across device. Closes #108
 
 0.15.0 / 2015-01-21
 -------------------

diff --git a/lib/move.js b/lib/move.js
@@ -77,11 +77,17 @@ function moveFileAcrossDevice(source, dest, clobber, limit, callback) {
     outs.destroy()
     outs.removeListener('close', onClose)
 
-    if (err.code === 'EISDIR' || err.code === 'EPERM') {
-      moveDirAcrossDevice(source, dest, clobber, limit, callback)
-    } else {
-      callback(err)
-    }
+    // may want to create a directory but `out` line above
+    // creates an empty file for us: See #108
+    // don't care about error here
+    fs.unlink(dest, function() {
+      // note: `err` here is from the input stream errror
+      if (err.code === 'EISDIR' || err.code === 'EPERM') {
+        moveDirAcrossDevice(source, dest, clobber, limit, callback)
+      } else {
+        callback(err)
+      }
+    })
   })
 
   outs.on('error', function(err) {