6.2.0 [ci skip]

protobufjs · Dec 15, 2016 · b40c86a · b40c86a
1 parent fb74223
commit b40c86a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 41 deletions.
diff --git a/cli/pbjs.js b/cli/pbjs.js
@@ -39,38 +39,39 @@ exports.main = function(args, callback) {
         var descs = Object.keys(targets).filter(function(key) { return !targets[key].private; }).map(function(key) {
             return "                  " + util.pad(key, 14, true) + targets[key].description;
         });
-        console.log([
-            "protobuf.js v" + pkg.version + " cli",
-            "",
-            "Consolidates imports and converts between file formats.",
-            "",
-            "  -t, --target    Specifies the target format. Also accepts a path to require a custom target.",
-            "",
-            descs.join('\n'),
-            "",
-            "  -p, --path      Adds a directory to the include path.",
-            "",
-            "  -o, --out       Saves to a file instead of writing to stdout.",
-            "",
-            "  -w, --wrap      Specifies the wrapper to use for *-module targets. Also accepts a path.",
-            "",
-            "                  default   Default wrapper supporting both CommonJS and AMD",
-            "                  commonjs  CommonJS only wrapper",
-            "                  amd       AMD only wrapper",
-            "",
-            "  -r, --root      Specifies an alternative protobuf.roots name for *-module targets.",
-            "",
-            "  Static code generation only:",
-            "",
-            "  --no-encode     Does not generate encode functions.",
-            "  --no-decode     Does not generate decode functions.",
-            "  --no-verify     Does not generate verify functions.",
-            "  --no-delimited  Does not generate delimited encode/decode functions.",
-            "",
-            "usage: " + chalk.bold.green(path.basename(process.argv[1])) + " [options] file1.proto file2.json ..."
-        ].join("\n"));
         if (callback)
             callback(Error("usage"));
+        else
+            console.error([
+                "protobuf.js v" + pkg.version + " cli",
+                "",
+                "Consolidates imports and converts between file formats.",
+                "",
+                "  -t, --target    Specifies the target format. Also accepts a path to require a custom target.",
+                "",
+                descs.join('\n'),
+                "",
+                "  -p, --path      Adds a directory to the include path.",
+                "",
+                "  -o, --out       Saves to a file instead of writing to stdout.",
+                "",
+                "  -w, --wrap      Specifies the wrapper to use for *-module targets. Also accepts a path.",
+                "",
+                "                  default   Default wrapper supporting both CommonJS and AMD",
+                "                  commonjs  CommonJS only wrapper",
+                "                  amd       AMD only wrapper",
+                "",
+                "  -r, --root      Specifies an alternative protobuf.roots name for *-module targets.",
+                "",
+                "  Static code generation only:",
+                "",
+                "  --no-encode     Does not generate encode functions.",
+                "  --no-decode     Does not generate decode functions.",
+                "  --no-verify     Does not generate verify functions.",
+                "  --no-delimited  Does not generate delimited encode/decode functions.",
+                "",
+                "usage: " + chalk.bold.green("pbjs") + " [options] file1.proto file2.json ..."
+            ].join("\n"));
         return 1;
     }
 

diff --git a/cli/pbts.js b/cli/pbts.js
@@ -30,17 +30,20 @@ exports.main = function(args, callback) {
     var files  = argv._;
 
     if (!files.length) {
-        console.log([
-            "protobuf.js v" + pkg.version + " cli for TypeScript",
-            "",
-            "Generates TypeScript definitions from annotated JavaScript files.",
-            "",
-            "  -n, --name      Wraps everything in a module of the specified name.",
-            "",
-            "  -o, --out       Saves to a file instead of writing to stdout.",
-            "",
-            "usage: " + chalk.bold.green(path.basename(process.argv[1])) + " [options] file1.js file2.js ..."
-        ].join("\n"));
+        if (callback)
+            callback(Error("usage"));
+        else
+            console.error([
+                "protobuf.js v" + pkg.version + " cli for TypeScript",
+                "",
+                "Generates TypeScript definitions from annotated JavaScript files.",
+                "",
+                "  -n, --name      Wraps everything in a module of the specified name.",
+                "",
+                "  -o, --out       Saves to a file instead of writing to stdout.",
+                "",
+                "usage: " + chalk.bold.green("pbts") + " [options] file1.js file2.js ..."
+            ].join("\n"));
         if (callback)
             callback(Error("usage"));
         return 1;