fixed setopt() and showHelp() to ignore "node" at argv[0] if exists

dresende · Mar 25, 2011 · b13f632 · b13f632
1 parent ca977b2
commit b13f632
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/getopt.js b/lib/getopt.js
@@ -7,9 +7,11 @@ function stringRepeat(str, num) {
 }
 
 exports.showHelp = function (title, cb) {
+	var path = require('path');
+
 	console.log("  %s", title);
 	console.log("  ------------------");
-	console.log("  %s <options>", process.argv[0]);
+	console.log("  %s <options>", path.basename(process.argv[path.basename(process.execPath) == process.argv[0] ? 1 : 0]));
 	console.log("");
 
 	var list = [],
@@ -70,8 +72,11 @@ exports.getopt = function (cb) {
 	}
 };
 exports.setopt = function (o, args) {
-	if (typeof args == "undefined") args = process.argv.slice(2);
-	if (typeof args.length == "undefined") args = args.split(/\s+/);
+	if (typeof args == "undefined") {
+		var path = require('path');
+		// allows argv like "node script.js params" and "script.js params"
+		args = process.argv.slice(path.basename(process.execPath) == process.argv[0] ? 2 : 1);
+	}
 
 	opt_defs = o;