Fix error handling and update commands list

kgryte · kgryte · commit 81edd48fe0a8 · 2018-05-02T19:30:47.000-07:00
diff --git a/bin/cli b/bin/cli
@@ -74,23 +74,22 @@ function main() {
 	args = cli.args();
 
 	// Extract the command:
-	cmd = args[ 0 ];
-	if ( cmd === 'help' ) {
+	if ( args[ 0 ] === 'help' ) {
 		if ( args[ 1 ] === void 0 ) {
 			return cli.help();
 		}
 		cmd = COMMANDS[ args[ 1 ] ];
 		if ( cmd === void 0 ) {
-			return onError( new Error( 'invalid argument. Unrecognized/unsupported command. Value: `' + cmd + '`.' ) );
+			return onError( new Error( 'invalid argument. Unrecognized/unsupported command. Value: `' + args[ 1 ] + '`.' ) );
 		}
-		cmd = resolve( __dirname, '..', cmd );
+		cmd = resolve( __dirname, '..', cmd.path );
 		subargs = [ cmd, '--help' ];
 	} else {
-		cmd = COMMANDS[ cmd ];
+		cmd = COMMANDS[ args[ 0 ] ];
 		if ( cmd === void 0 ) {
-			return onError( new Error( 'invalid argument. Unrecognized/unsupported command. Value: `' + cmd + '`.' ) );
+			return onError( new Error( 'invalid argument. Unrecognized/unsupported command. Value: `' + args[ 0 ] + '`.' ) );
 		}
-		cmd = resolve( __dirname, '..', cmd );
+		cmd = resolve( __dirname, '..', cmd.path );
 		subargs = [ cmd ];
 		for ( i = 1; i < args.length; i++ ) {
 			subargs.push( args[ i ] );
diff --git a/bin/commands.json b/bin/commands.json
@@ -1,7 +1,17 @@
 {
-	"datasets": "./lib/node_modules/@stdlib/datasets/bin/cli",
-	"ls": "./lib/node_modules/@stdlib/_tools/pkgs/names/bin/cli",
-	"ls-tree": "./lib/node_modules/@stdlib/_tools/pkgs/tree/bin/cli",
-	"ns": "./lib/node_modules/@stdlib/namespace/bin/cli",
-	"repl": "./lib/node_modules/@stdlib/repl/bin/cli"
+	"datasets": {
+		"path": "./lib/node_modules/@stdlib/datasets/bin/cli"
+	},
+	"ls": {
+		"path": "./lib/node_modules/@stdlib/_tools/pkgs/names/bin/cli"
+	},
+	"ls-tree": {
+		"path": "./lib/node_modules/@stdlib/_tools/pkgs/tree/bin/cli"
+	},
+	"ns": {
+		"path": "./lib/node_modules/@stdlib/namespace/bin/cli"
+	},
+	"repl": {
+		"path": "./lib/node_modules/@stdlib/repl/bin/cli"
+	}
 }
