diff options
author | isaacs <i@izs.me> | 2010-08-23 21:52:55 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2010-08-23 21:52:55 +0400 |
commit | 7aa855e0a6496b333a3f1c5c36231bf5d685b6c6 (patch) | |
tree | 7e0387534802e02eaaeb041696e2846980dd7d81 | |
parent | 462ef6b22ba13cf91d85f081d7859a44488ce44c (diff) |
Use the graceful-fs module instead of using fs directly.
-rwxr-xr-x | cli.js | 2 | ||||
-rw-r--r-- | lib/activate.js | 2 | ||||
-rw-r--r-- | lib/build.js | 2 | ||||
-rw-r--r-- | lib/cache.js | 2 | ||||
-rw-r--r-- | lib/deactivate.js | 2 | ||||
-rw-r--r-- | lib/help.js | 2 | ||||
-rw-r--r-- | lib/install.js | 2 | ||||
-rw-r--r-- | lib/link.js | 2 | ||||
-rw-r--r-- | lib/uninstall.js | 2 | ||||
-rw-r--r-- | lib/update-dependents.js | 2 | ||||
-rw-r--r-- | lib/utils/fetch.js | 2 | ||||
-rw-r--r-- | lib/utils/ini.js | 6 | ||||
-rw-r--r-- | lib/utils/lifecycle.js | 2 | ||||
-rw-r--r-- | lib/utils/link.js | 2 | ||||
-rw-r--r-- | lib/utils/mkdir-p.js | 2 | ||||
-rw-r--r-- | lib/utils/read-installed.js | 2 | ||||
-rw-r--r-- | lib/utils/read-json.js | 2 | ||||
-rw-r--r-- | lib/utils/registry/request.js | 2 | ||||
-rw-r--r-- | lib/utils/rm-rf.js | 2 | ||||
-rw-r--r-- | lib/utils/write-shim.js | 2 | ||||
-rwxr-xr-x | npm.js | 2 | ||||
-rw-r--r-- | scripts/install-docs.js | 2 |
22 files changed, 23 insertions, 25 deletions
@@ -6,7 +6,7 @@ var log = require("./lib/utils/log") log("ok", "it worked if it ends with") -var fs = require("fs") +var fs = require("./lib/utils/graceful-fs") , path = require("path") , sys = require("sys") , npm = require("./npm") diff --git a/lib/activate.js b/lib/activate.js index 334219981..8f922888a 100644 --- a/lib/activate.js +++ b/lib/activate.js @@ -6,7 +6,7 @@ var mkdir = require("./utils/mkdir-p") , npm = require("../npm") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , log = require("./utils/log") , path = require("path") , rm = require("./utils/rm-rf") diff --git a/lib/build.js b/lib/build.js index 2e4aa66e6..dd2a0d440 100644 --- a/lib/build.js +++ b/lib/build.js @@ -13,7 +13,7 @@ var npm = require("../npm") , rm = require("./utils/rm-rf") , chain = require("./utils/chain") , fetch = require("./utils/fetch") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , path = require("path") , semver = require("./utils/semver") , mkdir = require("./utils/mkdir-p") diff --git a/lib/cache.js b/lib/cache.js index a48310ad8..563d5795b 100644 --- a/lib/cache.js +++ b/lib/cache.js @@ -7,7 +7,7 @@ var mkdir = require("./utils/mkdir-p") , exec = require("./utils/exec") , fetch = require("./utils/fetch") , npm = require("../npm") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , rm = require("./utils/rm-rf") , readJson = require("./utils/read-json") , registry = require("./utils/registry") diff --git a/lib/deactivate.js b/lib/deactivate.js index f3dfe1421..24f406a90 100644 --- a/lib/deactivate.js +++ b/lib/deactivate.js @@ -1,7 +1,7 @@ var mkdir = require("./utils/mkdir-p") , npm = require("../npm") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , log = require("./utils/log") , path = require("path") , rm = require("./utils/rm-rf") diff --git a/lib/help.js b/lib/help.js index cea4236d7..8323632b9 100644 --- a/lib/help.js +++ b/lib/help.js @@ -1,5 +1,5 @@ -var fs = require("fs") +var fs = require("./utils/graceful-fs") , path = require("path") , exec = require("./utils/exec") diff --git a/lib/install.js b/lib/install.js index 349b89abe..01849e475 100644 --- a/lib/install.js +++ b/lib/install.js @@ -27,7 +27,7 @@ var registry = require("./utils/registry") , log = require("./utils/log") , path = require("path") , chain = require("./utils/chain") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , cache = require("./cache") , asyncMap = require("./utils/async-map") diff --git a/lib/link.js b/lib/link.js index f0258752f..3438e6353 100644 --- a/lib/link.js +++ b/lib/link.js @@ -4,7 +4,7 @@ var npm = require("../npm") , chain = require("./utils/chain") , log = require("./utils/log") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , readJson = require("./utils/read-json") , rm = require("./utils/rm-rf") , mkdir = require("./utils/mkdir-p") diff --git a/lib/uninstall.js b/lib/uninstall.js index 224c8af7c..33faf908e 100644 --- a/lib/uninstall.js +++ b/lib/uninstall.js @@ -6,7 +6,7 @@ module.exports = uninstall var rm = require("./utils/rm-rf") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , log = require("./utils/log") , readJson = require("./utils/read-json") , path = require("path") diff --git a/lib/update-dependents.js b/lib/update-dependents.js index fcae1bea7..7837a7646 100644 --- a/lib/update-dependents.js +++ b/lib/update-dependents.js @@ -26,7 +26,7 @@ var readInstalled = require("./utils/read-installed") , shimIfExists = shim.ifExists , readJson = require("./utils/read-json") , log = require("./utils/log") - , fs = require("fs") + , fs = require("./utils/graceful-fs") , rm = require("./utils/rm-rf") , lifecycle = require("./utils/lifecycle") diff --git a/lib/utils/fetch.js b/lib/utils/fetch.js index 31683eb27..8897e0781 100644 --- a/lib/utils/fetch.js +++ b/lib/utils/fetch.js @@ -5,7 +5,7 @@ var http = require("http") , url = require("url") , sys = require("sys") - , fs = require("fs") + , fs = require("./graceful-fs") , get = require("./get") , set = require("./set") , log = require("./log") diff --git a/lib/utils/ini.js b/lib/utils/ini.js index c715a4391..004fdcfb7 100644 --- a/lib/utils/ini.js +++ b/lib/utils/ini.js @@ -26,7 +26,7 @@ exports.set = set Object.defineProperty(exports, "keys", { get : function () { return configList.keys }}) -var fs = require("fs") +var fs = require("./graceful-fs") , path = require("path") , http = require("http") , sys = require("sys") @@ -103,9 +103,7 @@ function parseField (f) { function parseFile (file, cb) { log(file, "config file") fs.readFile(file, function (er, data) { - if (er) { - return cb(null, {}) - } + if (er) return cb(null, {}) var d = ini.parse(""+data)["-"] Object.keys(d).forEach(function (k) { d[k] = parseField(d[k]) }) decryptAuth(d, cb) diff --git a/lib/utils/lifecycle.js b/lib/utils/lifecycle.js index ab441447d..91d46e00b 100644 --- a/lib/utils/lifecycle.js +++ b/lib/utils/lifecycle.js @@ -7,7 +7,7 @@ var log = require("./log") , npm = require("../../npm") , path = require("path") , readJson = require("./read-json") - , fs = require("fs") + , fs = require("./graceful-fs") function lifecycle (pkg, stage, cb) { while (pkg && pkg._data) pkg = pkg._data diff --git a/lib/utils/link.js b/lib/utils/link.js index b5fc45cf6..193e2f2dd 100644 --- a/lib/utils/link.js +++ b/lib/utils/link.js @@ -2,7 +2,7 @@ module.exports = link link.ifExists = linkIfExists -var fs = require("fs") +var fs = require("./graceful-fs") , chain = require("./chain") , mkdir = require("./mkdir-p") , rm = require("./rm-rf") diff --git a/lib/utils/mkdir-p.js b/lib/utils/mkdir-p.js index c12b24693..5bf77509e 100644 --- a/lib/utils/mkdir-p.js +++ b/lib/utils/mkdir-p.js @@ -1,6 +1,6 @@ var log = require("../utils/log") - , fs = require("fs") + , fs = require("./graceful-fs") , path = require("path") module.exports = mkdir diff --git a/lib/utils/read-installed.js b/lib/utils/read-installed.js index 34cd666f7..a1e0a450c 100644 --- a/lib/utils/read-installed.js +++ b/lib/utils/read-installed.js @@ -4,7 +4,7 @@ // installed/active versions of each package. var npm = require("../../npm") - , fs = require("fs") + , fs = require("./graceful-fs") , path = require("path") , log = require("./log") , mkdir = require("./mkdir-p") diff --git a/lib/utils/read-json.js b/lib/utils/read-json.js index 38aa6ddfb..8b71971b2 100644 --- a/lib/utils/read-json.js +++ b/lib/utils/read-json.js @@ -2,7 +2,7 @@ module.exports = readJson readJson.processJson = processJson -var fs = require("fs") +var fs = require("./graceful-fs") , semver = require("./semver") , path = require("path") diff --git a/lib/utils/registry/request.js b/lib/utils/registry/request.js index 993c8cfb9..cd68529ed 100644 --- a/lib/utils/registry/request.js +++ b/lib/utils/registry/request.js @@ -11,7 +11,7 @@ var npm = require("../../../npm") , log = require("../log") , ini = require("../ini") , Buffer = require("buffer").Buffer - , fs = require("fs") + , fs = require("../graceful-fs") function request (method, where, what, cb) { log(where||"/", method) diff --git a/lib/utils/rm-rf.js b/lib/utils/rm-rf.js index 9605e8c64..3fbf2ce0b 100644 --- a/lib/utils/rm-rf.js +++ b/lib/utils/rm-rf.js @@ -3,7 +3,7 @@ module.exports = rm -var fs = require("fs") +var fs = require("./graceful-fs") , path = require("path") , sys = require("sys") , failedToRemove = [] diff --git a/lib/utils/write-shim.js b/lib/utils/write-shim.js index e295059aa..8941de023 100644 --- a/lib/utils/write-shim.js +++ b/lib/utils/write-shim.js @@ -2,7 +2,7 @@ module.exports = writeShim writeShim.ifExists = shimIfExists -var fs = require("fs") +var fs = require("./graceful-fs") , path = require("path") , relativize = require("./relativize") , mkdir = require("./mkdir-p") @@ -6,7 +6,7 @@ var npm = exports , get = require("./lib/utils/get") , ini = require("./lib/utils/ini") , log = require("./lib/utils/log") - , fs = require("fs") + , fs = require("./lib/utils/graceful-fs") , path = require("path") npm.commands = {} diff --git a/scripts/install-docs.js b/scripts/install-docs.js index 77727a431..544fb622c 100644 --- a/scripts/install-docs.js +++ b/scripts/install-docs.js @@ -7,7 +7,7 @@ var event = process.env.npm_lifecycle_event , npm = require("../npm") , exec = require("../lib/utils/exec") , log = require("../lib/utils/log") - , fs = require("fs") + , fs = require("../lib/utils/graceful-fs") , path = require("path") , rm = require("../lib/utils/rm-rf") , mkdir = require("../lib/utils/mkdir-p") |