1 files changed, 3 insertions, 71 deletions
diff --git a/deps/npm/lib/cache/get-stat.js b/deps/npm/lib/cache/get-stat.js
index 98f95ad6a..6ea797a4d 100644
--- a/deps/npm/lib/cache/get-stat.js
+++ b/deps/npm/lib/cache/get-stat.js
@@ -1,74 +1,6 @@
-var mkdir = require("mkdirp")
-  , fs = require("graceful-fs")
-  , log = require("npmlog")
-  , chownr = require("chownr")
-  , npm = require("../npm.js")
-  , inflight = require("inflight")
+var npm = require('../npm.js')
+var correctMkdir = require('../utils/correct-mkdir.js')
 
-// to maintain the cache dir's permissions consistently.
-var cacheStat = null
 module.exports = function getCacheStat (cb) {
-  if (cacheStat) return cb(null, cacheStat)
-
-  fs.stat(npm.cache, function (er, st) {
-    if (er) return makeCacheDir(cb)
-    if (!st.isDirectory()) {
-      log.error("getCacheStat", "invalid cache dir %j", npm.cache)
-      return cb(er)
-    }
-    return cb(null, cacheStat = st)
-  })
-}
-
-function makeCacheDir (cb) {
-  cb = inflight("makeCacheDir", cb)
-  if (!cb) {
-    return log.verbose(
-      "getCacheStat",
-      "cache creation already in flight; waiting"
-    )
-  }
-  log.verbose("getCacheStat", "cache creation not in flight; initializing")
-
-  if (!process.getuid) return mkdir(npm.cache, function (er) {
-    log.verbose("makeCacheDir", "UID & GID are irrelevant on", process.platform)
-    cacheStat = { uid : 0, gid : 0 }
-    return cb(er, cacheStat)
-  })
-
-  var uid = +process.getuid()
-    , gid = +process.getgid()
-
-  if (uid === 0) {
-    if (process.env.SUDO_UID) uid = +process.env.SUDO_UID
-    if (process.env.SUDO_GID) gid = +process.env.SUDO_GID
-  }
-
-  if (uid !== 0 || !process.env.HOME) {
-    cacheStat = { uid : uid, gid : gid }
-    return mkdir(npm.cache, afterMkdir)
-  }
-
-  fs.stat(process.env.HOME, function (er, st) {
-    if (er) {
-      log.error("makeCacheDir", "homeless?")
-      return cb(er)
-    }
-    cacheStat = st
-    log.silly("makeCacheDir", "cache dir uid, gid", [st.uid, st.gid])
-    return mkdir(npm.cache, afterMkdir)
-  })
-
-  function afterMkdir (er, made) {
-    if (er || !cacheStat || isNaN(cacheStat.uid) || isNaN(cacheStat.gid)) {
-      return cb(er, cacheStat)
-    }
-
-    if (!made) return cb(er, cacheStat)
-
-    // ensure that the ownership is correct.
-    chownr(made, cacheStat.uid, cacheStat.gid, function (er) {
-      return cb(er, cacheStat)
-    })
-  }
+  correctMkdir(npm.cache, cb)
 }