1 files changed, 46 insertions, 47 deletions

diff --git a/lib/cache/add-local.js b/lib/cache/add-local.js
index dbe55ddc2..075ca5fc6 100644
--- a/lib/cache/add-local.js
+++ b/lib/cache/add-local.js
@@ -1,46 +1,45 @@
-var assert = require("assert")
-  , path = require("path")
-  , mkdir = require("mkdirp")
-  , chownr = require("chownr")
-  , pathIsInside = require("path-is-inside")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , npm = require("../npm.js")
-  , tar = require("../utils/tar.js")
-  , deprCheck = require("../utils/depr-check.js")
-  , getCacheStat = require("./get-stat.js")
-  , cachedPackageRoot = require("./cached-package-root.js")
-  , addLocalTarball = require("./add-local-tarball.js")
-  , sha = require("sha")
-  , inflight = require("inflight")
-  , lifecycle = require("../utils/lifecycle.js")
-  , iferr = require("iferr")
+var assert = require('assert')
+var path = require('path')
+var mkdir = require('mkdirp')
+var chownr = require('chownr')
+var pathIsInside = require('path-is-inside')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var npm = require('../npm.js')
+var tar = require('../utils/tar.js')
+var deprCheck = require('../utils/depr-check.js')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var addLocalTarball = require('./add-local-tarball.js')
+var sha = require('sha')
+var inflight = require('inflight')
+var lifecycle = require('../utils/lifecycle.js')
+var iferr = require('iferr')
 
 module.exports = addLocal
 
 function addLocal (p, pkgData, cb_) {
-  assert(typeof p === "object", "must have spec info")
-  assert(typeof cb === "function", "must have callback")
+  assert(typeof p === 'object', 'must have spec info')
+  assert(typeof cb === 'function', 'must have callback')
 
   pkgData = pkgData || {}
 
   function cb (er, data) {
     if (er) {
-      log.error("addLocal", "Could not install %s", p.spec)
+      log.error('addLocal', 'Could not install %s', p.spec)
       return cb_(er)
     }
     if (data && !data._fromHosted) {
-      data._from = path.relative(npm.prefix, p.spec) || "."
+      data._from = path.relative(npm.prefix, p.spec) || '.'
       var resolved = path.relative(npm.prefix, p.spec)
-      if (resolved) data._resolved = "file:"+resolved
+      if (resolved) data._resolved = 'file:' + resolved
     }
     return cb_(er, data)
   }
 
-  if (p.type === "directory") {
+  if (p.type === 'directory') {
     addLocalDirectory(p.spec, pkgData, null, cb)
-  }
-  else {
+  } else {
     addLocalTarball(p.spec, pkgData, null, cb)
   }
 }
@@ -48,33 +47,34 @@ function addLocal (p, pkgData, cb_) {
 // At this point, if shasum is set, it's something that we've already
 // read and checked.  Just stashing it in the data at this point.
 function addLocalDirectory (p, pkgData, shasum, cb) {
-  assert(pkgData, "must pass package data")
-  assert(typeof cb === "function", "must have callback")
+  assert(pkgData, 'must pass package data')
+  assert(typeof cb === 'function', 'must have callback')
 
   // if it's a folder, then read the package.json,
   // tar it to the proper place, and add the cache tar
-  if (pathIsInside(p, npm.cache)) return cb(new Error(
-    "Adding a cache directory to the cache will make the world implode."))
+  if (pathIsInside(p, npm.cache)) {
+    return cb(new Error(
+    'Adding a cache directory to the cache will make the world implode.'
+    ))
+  }
 
-  readJson(path.join(p, "package.json"), false, function (er, data) {
+  readJson(path.join(p, 'package.json'), false, function (er, data) {
     if (er) return cb(er)
 
     if (!data.name) {
-      return cb(new Error("No name provided in package.json"))
-    }
-    else if (pkgData.name && pkgData.name !== data.name) {
+      return cb(new Error('No name provided in package.json'))
+    } else if (pkgData.name && pkgData.name !== data.name) {
       return cb(new Error(
-        "Invalid package: expected " + pkgData.name + " but found " + data.name
+        'Invalid package: expected ' + pkgData.name + ' but found ' + data.name
       ))
     }
 
     if (!data.version) {
-      return cb(new Error("No version provided in package.json"))
-    }
-    else if (pkgData.version && pkgData.version !== data.version) {
+      return cb(new Error('No version provided in package.json'))
+    } else if (pkgData.version && pkgData.version !== data.version) {
       return cb(new Error(
-        "Invalid package: expected " + pkgData.name + "@" + pkgData.version +
-          " but found " + data.name + "@" + data.version
+        'Invalid package: expected ' + pkgData.name + '@' + pkgData.version +
+          ' but found ' + data.name + '@' + data.version
       ))
     }
 
@@ -82,27 +82,26 @@ function addLocalDirectory (p, pkgData, shasum, cb) {
 
     // pack to {cache}/name/ver/package.tgz
     var root = cachedPackageRoot(data)
-    var tgz = path.resolve(root, "package.tgz")
-    var pj = path.resolve(root, "package/package.json")
+    var tgz = path.resolve(root, 'package.tgz')
+    var pj = path.resolve(root, 'package/package.json')
 
     var wrapped = inflight(tgz, next)
-    if (!wrapped) return log.verbose("addLocalDirectory", tgz, "already in flight; waiting")
-    log.verbose("addLocalDirectory", tgz, "not in flight; packing")
+    if (!wrapped) return log.verbose('addLocalDirectory', tgz, 'already in flight; waiting')
+    log.verbose('addLocalDirectory', tgz, 'not in flight; packing')
 
     getCacheStat(function (er, cs) {
       mkdir(path.dirname(pj), function (er, made) {
         if (er) return cb(er)
         var doPrePublish = !pathIsInside(p, npm.tmp)
         if (doPrePublish) {
-          lifecycle(data, "prepublish", p, iferr(cb, thenPack))
-        }
-        else {
+          lifecycle(data, 'prepublish', p, iferr(cb, thenPack))
+        } else {
           thenPack()
         }
         function thenPack () {
           tar.pack(tgz, p, data, function (er) {
             if (er) {
-              log.error("addLocalDirectory", "Could not pack", p, "to", tgz)
+              log.error('addLocalDirectory', 'Could not pack', p, 'to', tgz)
               return cb(er)
             }