diff options
author | isaacs <i@izs.me> | 2011-03-23 03:28:57 +0300 |
---|---|---|
committer | isaacs <i@izs.me> | 2011-03-23 03:28:57 +0300 |
commit | dbf5e805af54be8b111726676f69dc4caea81eb1 (patch) | |
tree | 25ef7a2d92d146c394f41e9d663230653c389004 | |
parent | bc7cef10ed68c26b5e7f8df1e719f35a08828060 (diff) |
Closes GH-739 Don't default directories.
-rw-r--r-- | lib/utils/load-package-defaults.js | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/lib/utils/load-package-defaults.js b/lib/utils/load-package-defaults.js index 2e825f4b9..a173fe75b 100644 --- a/lib/utils/load-package-defaults.js +++ b/lib/utils/load-package-defaults.js @@ -18,18 +18,13 @@ function loadPackageDefaults (pkg, pkgDir, cb) { if (pkg._defaultsLoaded) return cb(null, pkg) - readDefaultDirs(pkgDir)(pkg, function (er) { - if (er) return cb(er) - if (pkg._defaultsLoaded) return cb(null, pkg) - asyncMap - ( [pkg] - , function (pkg, cb) { log.verbose(pkg._id, "loadDefaults", cb) } - , readDefaultBins(pkgDir) - , readDefaultMans(pkgDir) - , function (pkg, cb) { pkg._defaultsLoaded = true ; cb() } - , function (er) { cb(er, pkg) } - ) - }) + pkg._defaultsLoaded = true + asyncMap + ( [pkg] + , function (pkg, cb) { log.verbose(pkg._id, "loadDefaults", cb) } + , readDefaultBins(pkgDir) + , readDefaultMans(pkgDir) + , function (er) { cb(er, pkg) } ) } function addFile (list, f) { @@ -62,28 +57,6 @@ function objectForEach (obj, fn) { }) } -function readDefaultDirs (pkgDir) { return function (pkg, cb) { - if (pkg.directories && typeof pkg.directories !== "object" - || Array.isArray(pkg.directories)) { - log.warn(pkg.directories, pkg._id + ": invalid 'directories' field") - delete pkg.directories - } - var dirs = pkg.directories = pkg.directories || {} - , defaults = - { lib : "./lib" - , bin : "./bin" - , man : "./man" - , doc : "./doc" - } - asyncMap(Object.keys(defaults), function (d, cb) { - if (dirs[d]) return cb() - fs.stat(path.join(pkgDir, defaults[d]), function (er, s) { - if (s && s.isDirectory()) dirs[d] = defaults[d] - cb() - }) - }, cb) -}} - function readDefaultMans (pkgDir) { return function (pkg, cb) { var man = pkg.directories && pkg.directories.man , manDir = path.join(pkgDir, man) @@ -124,4 +97,3 @@ function readDefaultBins (pkgDir) { return function (pkg, cb) { cb(null, pkg) }) }} - |