Permalink
Browse files

Put executables in ./bin

Move towards having multiple different executables for various things.
  • Loading branch information...
1 parent 609ed56 commit 1424fb379939625dd03ce15ca617fbb8244e5564 @isaacs isaacs committed Jan 9, 2011
Showing with 62 additions and 57 deletions.
  1. +56 −0 bin/npm.js
  2. +1 −55 cli.js
  3. +5 −2 package.json
View
@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+;(function () { // wrapper in case we're in module_context mode
+var log = require("../lib/utils/log")
+log.waitForConfig()
+log.info("ok", "it worked if it ends with")
+
+var fs = require("../lib/utils/graceful-fs")
+ , path = require("path")
+ , sys = require("../lib/utils/sys")
+ , npm = require("../npm")
+ , ini = require("../lib/utils/ini")
+ , rm = require("../lib/utils/rm-rf")
+ , errorHandler = require("../lib/utils/error-handler")
+
+ , argv = process.argv.slice(2)
+ , parseArgs = require("../lib/utils/parse-args")
+
+log.verbose(argv, "cli")
+
+var conf = parseArgs(argv)
+npm.argv = conf.argv.remain
+if (npm.deref(npm.argv[0])) npm.command = npm.argv.shift()
+else conf.usage = true
+
+
+if (conf.version) {
+ console.log(npm.version)
+ return
+} else log("npm@"+npm.version, "using")
+log("node@"+process.version, "using")
+
+// make sure that this version of node works with this version of npm.
+var semver = require("../lib/utils/semver")
+ , nodeVer = process.version
+ , reqVer = npm.nodeVersionRequired
+if (reqVer && !semver.satisfies(nodeVer, reqVer)) {
+ return errorHandler(new Error(
+ "npm doesn't work with node " + nodeVer
+ + "\nRequired: node@" + reqVer), true)
+}
+
+process.on("uncaughtException", errorHandler)
+
+if (conf.usage && npm.command !== "help") {
+ npm.argv.unshift(npm.command)
+ npm.command = "help"
+}
+
+// now actually fire up npm and run the command.
+// this is how to use npm programmatically:
+conf._exit = true
+npm.load(conf, function (er) {
+ if (er) return errorHandler(er)
+ npm.commands[npm.command](npm.argv, errorHandler)
+})
+})()
View
@@ -1,56 +1,2 @@
#!/usr/bin/env node
-;(function () { // wrapper in case we're in module_context mode
-var log = require("./lib/utils/log")
-log.waitForConfig()
-log.info("ok", "it worked if it ends with")
-
-var fs = require("./lib/utils/graceful-fs")
- , path = require("path")
- , sys = require("./lib/utils/sys")
- , npm = require("./npm")
- , ini = require("./lib/utils/ini")
- , rm = require("./lib/utils/rm-rf")
- , errorHandler = require("./lib/utils/error-handler")
-
- , argv = process.argv.slice(2)
- , parseArgs = require("./lib/utils/parse-args")
-
-log.verbose(argv, "cli")
-
-var conf = parseArgs(argv)
-npm.argv = conf.argv.remain
-if (npm.deref(npm.argv[0])) npm.command = npm.argv.shift()
-else conf.usage = true
-
-
-if (conf.version) {
- console.log(npm.version)
- return
-} else log("npm@"+npm.version, "using")
-log("node@"+process.version, "using")
-
-// make sure that this version of node works with this version of npm.
-var semver = require("./lib/utils/semver")
- , nodeVer = process.version
- , reqVer = npm.nodeVersionRequired
-if (reqVer && !semver.satisfies(nodeVer, reqVer)) {
- return errorHandler(new Error(
- "npm doesn't work with node " + nodeVer
- + "\nRequired: node@" + reqVer), true)
-}
-
-process.on("uncaughtException", errorHandler)
-
-if (conf.usage && npm.command !== "help") {
- npm.argv.unshift(npm.command)
- npm.command = "help"
-}
-
-// now actually fire up npm and run the command.
-// this is how to use npm programmatically:
-conf._exit = true
-npm.load(conf, function (er) {
- if (er) return errorHandler(er)
- npm.commands[npm.command](npm.argv, errorHandler)
-})
-})()
+require("./bin/npm.js")
View
@@ -39,8 +39,11 @@
{ "mail" : "npm-@googlegroups.com"
, "web" : "http://github.com/isaacs/npm/issues"
}
-, "directories" : { "doc" : "./doc", "man" : "./man1", "lib" : "./lib" }
-, "bin" : { "npm" : "./cli.js" }
+, "directories" : { "doc" : "./doc"
+ , "man" : "./man1"
+ , "lib" : "./lib"
+ , "bin" : "./bin"
+ }
, "main" : "npm"
, "engines" : { "node" : ">=0.2.3" }
, "scripts" : { "test" : "make test"

0 comments on commit 1424fb3

Please sign in to comment.