Use local installed webpack version, even if global command used

sokra · sokra · commit 7a40d0d008b1 · 2012-08-05T21:52:00.000+02:00
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -5,11 +5,19 @@
 	Author Tobias Koppers @sokra
 */
 var path = require("path");
+// Local version replace global one
+try {
+	var localWebpack = require.resolve(path.join(process.cwd(), "node_modules", "webpack", "bin", "webpack.js"));
+	if(__filename != localWebpack) {
+		return require(localWebpack);
+	}
+} catch(e) {}
 var fs = require("fs");
 var util = require("util");
 var sprintf = require("sprintf").sprintf;
 var argv = require("optimist")
-	.usage("Usage: $0 <input> <output>")
+	.usage("webpack " + require("../package.json").version + "\n" +
+		"Usage: $0 <input> <output>")
 
 	.boolean("min")
 	.describe("min", "Minimize it with uglifyjs")
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.4.23",
+	"version": "0.4.24",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.4.23",`
	`3`	`+ "version": "0.4.24",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",`
`6`	`6`	`"dependencies": {`