diff options
| author | isaacs <i@izs.me> | 2010-08-25 14:00:46 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2010-08-25 16:21:53 +0400 |
| commit | bf1be309a1237d1fc4df7f1fb795ff234ff7fc39 (patch) | |
| tree | 36f8cdf85ed7a53736df1c6918da815172952409 | |
| parent | 5a27c42495d16db060ae4ae6d09218d509ad97da (diff) | |
Clean up exec usage
| -rw-r--r-- | lib/adduser.js | 1 | ||||
| -rw-r--r-- | lib/build.js | 2 | ||||
| -rw-r--r-- | lib/install.js | 1 | ||||
| -rw-r--r-- | lib/utils/fetch.js | 5 |
4 files changed, 3 insertions, 6 deletions
diff --git a/lib/adduser.js b/lib/adduser.js index a8a61eab8..69b097bee 100644 --- a/lib/adduser.js +++ b/lib/adduser.js @@ -4,7 +4,6 @@ module.exports = adduser var registry = require('./utils/registry') , ini = require("./utils/ini") , log = require("./utils/log") - , exec = require("./utils/exec") , npm = require("../npm") , prompt = require("./utils/prompt") , promiseChain = require("./utils/promise-chain") diff --git a/lib/build.js b/lib/build.js index 4c8f0059f..29c48aa0b 100644 --- a/lib/build.js +++ b/lib/build.js @@ -209,7 +209,7 @@ function linkMans (pkg, cb) { , manroot = npm.config.get("manroot") , pkgDir = path.join(npm.dir, pkg.name, pkg.version, "package") if (!man || !manroot) return cb() - exec("manpath", [], null, true, function (er, code, stdout, stderr) { + exec("manpath", [], null, false, function (er, code, stdout, stderr) { var manpath = er ? [] : stdout.trim().split(":") if (manpath.indexOf(manroot) === -1) { log.warn( "It seems " + manroot + " might not be visible to man\n" diff --git a/lib/install.js b/lib/install.js index 3efbdfeb9..e70409ed0 100644 --- a/lib/install.js +++ b/lib/install.js @@ -20,7 +20,6 @@ var registry = require("./utils/registry") , semver = require("./utils/semver") , url = require("url") , fetch = require("./utils/fetch") - , exec = require("./utils/exec") , rm = require("./utils/rm-rf") , mkdir = require("./utils/mkdir-p") , readJson = require("./utils/read-json") diff --git a/lib/utils/fetch.js b/lib/utils/fetch.js index d6fdd3de1..0d09e041d 100644 --- a/lib/utils/fetch.js +++ b/lib/utils/fetch.js @@ -110,12 +110,11 @@ urls.forEach(function (url) { if (e) { log.error(e, fetchFile) ; throw e } exec( "wget" , ["-O", wgetFile, url] - , null, true , function (er, code, stdout, stderr) { if (e) { log.error(e, wgetFile) ; throw e } - exec("md5", ["-q", wgetFile], null, true, function (er, _, wghash, __) { + exec("md5", ["-q", wgetFile], function (er, _, wghash, __) { if (e) { log.error(e, "md5 "+wgetFile) ; throw e } - exec("md5", ["-q", fetchFile], null, true, function (er, _, fhash, __) { + exec("md5", ["-q", fetchFile], function (er, _, fhash, __) { if (e) { log.error(e, "md5 "+fetchFile) ; throw e } assert.equal(wghash, fhash, fetchFile + " == " + wgetFile) }) |