move: refactor to closure-based callbacks

Credit: @iarna
Reviewed-By: @zkat
PR-URL: npm#10655

lib/install/action/move.js

@@ -36,29 +36,35 @@ function moveModuleOnly (from, to, log, done) {
   var temp_modules = from + '.node_modules'
 
   log.silly('move', 'remove existing destination', to)
-  rimraf(to, iferr(done, makeDestination))
+  rimraf(to, iferr(done, makeDestination(done)))
 
-  function makeDestination () {
-    log.silly('move', 'make sure destination parent exists', path.resolve(to, '..'))
-    mkdirp(path.resolve(to, '..'), iferr(done, moveNodeModules))
+  function makeDestination (next) {
+    return function () {
+      log.silly('move', 'make sure destination parent exists', path.resolve(to, '..'))
+      mkdirp(path.resolve(to, '..'), iferr(done, moveNodeModules(next)))
+    }
   }
 
-  function moveNodeModules () {
-    log.silly('move', 'move source node_modules away', from_modules)
-    fs.rename(from_modules, temp_modules, function (er) {
-      doMove(er ? done : moveNodeModulesBack)
-    })
+  function moveNodeModules (next) {
+    return function () {
+      log.silly('move', 'move source node_modules away', from_modules)
+      fs.rename(from_modules, temp_modules, iferr(doMove(next), doMove(moveNodeModulesBack(next))))
+    }
   }
 
   function doMove (next) {
-    log.silly('move', 'move module dir to final dest', from, to)
-    fs.rename(from, to, iferr(done, next))
+    return function () {
+      log.silly('move', 'move module dir to final dest', from, to)
+      fs.rename(from, to, iferr(done, next))
+    }
   }
 
-  function moveNodeModulesBack () {
-    mkdirp(from, iferr(done, function () {
-      log.silly('move', 'put source node_modules back', from_modules)
-      fs.rename(temp_modules, from_modules, done)
-    }))
+  function moveNodeModulesBack (next) {
+    return function () {
+      mkdirp(from, iferr(done, function () {
+        log.silly('move', 'put source node_modules back', from_modules)
+        fs.rename(temp_modules, from_modules, iferr(done, next))
+      }))
+    }
   }
 }