s/dependencies/node_modules/g

olivoil · Oct 24, 2010 · b6ca68e · b6ca68e
1 parent 38804a6
commit b6ca68e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -173,10 +173,10 @@ function dependentLink (pkg, cb) {
 }
 
 
-// link each dep into this pkg's "dependencies" folder
+// link each dep into this pkg's "node_modules" folder
 function dependencyLink (pkg, cb) {
   pkg.link = pkg.link || {}
-  var dependencies = path.join(npm.dir, pkg.name, pkg.version, "dependencies")
+  var dependencies = path.join(npm.dir, pkg.name, pkg.version, "node_modules")
   asyncMap(pkg._resolvedDeps, function (dep, cb) {
     log.silly(dep, "dependency")
     var fromRoot = path.join(npm.dir, dep.name, dep.version)
@@ -267,7 +267,7 @@ function linkModules (pkg, target, cb) {
     writeShim
       ( path.join(pkgDir, mod[key])
       , path.join(target, key.replace(/\.js$/, '')+".js")
-      , path.join(versionDir, "dependencies")
+      , path.join(versionDir, "node_modules")
       , cb
       )
   }, cb)
@@ -277,7 +277,7 @@ function linkBins (pkg, cb) {
   if (!pkg.bin) return cb()
   log.verbose(pkg._id, "linkBins")
   var binroot = npm.config.get("binroot")
-    , dep = path.join(npm.dir, pkg.name, pkg.version, "dependencies")
+    , dep = path.join(npm.dir, pkg.name, pkg.version, "node_modules")
   if (!binroot) return cb()
   if (!process.env.PATH || -1 === process.env.PATH.indexOf(binroot)) {
     log.warn("bins installing to "+binroot+", outside PATH")

diff --git a/lib/update-dependents.js b/lib/update-dependents.js
@@ -159,18 +159,25 @@ function removeDependencyLinks (dep, pkg, other, cb) {
     // only support "@", not "-"
     , depsOnOld = path.join(depdir, "dependson", pkg.name+"-"+other)
     , depsOn = path.join(depdir, "dependson", pkg.name+"@"+other)
-    , deps = path.join(depdir, "dependencies", pkg.name)
+    , deps = path.join(depdir, "node_modules", pkg.name)
+    , depsOld = path.join(depdir, "dependencies", pkg.name)
     , dependentRoot = path.join( npm.dir
                                , pkg.name
                                , other
                                , "dependents"
                                )
     , dependentLinkOld = path.join(dependentRoot, dep.name + "-" + dep.version)
     , dependentLink = path.join(dependentRoot, dep.name + "@" + dep.version)
-  asyncMap([deps+".js", deps, depsOnOld, depsOn, dependentLink], rm, function (e) {
-    log.verbose( [deps+".js", deps, depsOnOld, depsOn, dependentLinkOld, dependentLink]
-               , "removed"
-               )
+    , rmList = [ deps+".js"
+               , deps
+               , depsOld
+               , depsOnOld
+               , depsOn
+               , dependentLinkOld
+               , dependentLink
+               ]
+  asyncMap(rmList, rm, function (e) {
+    log.verbose(rmList, "removed")
     cb(e)
   })
 }
@@ -180,7 +187,7 @@ function createDependencyLinks (dep, pkg, cb) {
                         , "dependson"
                         , pkg.name+"@"+pkg.version
                         )
-    , deps = path.join(depdir, "dependencies", pkg.name)
+    , deps = path.join(depdir, "node_modules", pkg.name)
     , targetRoot = path.join(npm.dir, pkg.name, pkg.version)
     , targetMain = path.join(targetRoot, "main.js")
     , targetLib = path.join(targetRoot, "lib")