Merge pull request #6433 from murgatroid99/tools_package_bin_namespacing

Make namespacing of executables exposed by grpc-tools packages consistent between Node and Ruby
9 years ago · de88da9c6b
parent 92a9156970 4e1ebfa176
commit de88da9c6b
4 changed files with 4 additions and 4 deletions
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@ -16,8 +16,8 @@
    }
  ],
  "bin": {
-    "grpc-tools-protoc": "./bin/protoc.js",
-    "grpc-tools-plugin": "./bin/protoc_plugin.js"
+    "grpc_tools_node_protoc": "./bin/protoc.js",
+    "grpc_tools_node_protoc_plugin": "./bin/protoc_plugin.js"
  },
  "scripts": {
    "install": "./node_modules/.bin/node-pre-gyp install"
--- a/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb
+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb
--- a/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb
+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb
--- a/templates/src/node/tools/package.json.template
+++ b/templates/src/node/tools/package.json.template
@ -18,8 +18,8 @@
      }
    ],
    "bin": {
-      "grpc-tools-protoc": "./bin/protoc.js",
-      "grpc-tools-plugin": "./bin/protoc_plugin.js"
+      "grpc_tools_node_protoc": "./bin/protoc.js",
+      "grpc_tools_node_protoc_plugin": "./bin/protoc_plugin.js"
    },
    "scripts": {
      "install": "./node_modules/.bin/node-pre-gyp install"