diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-05-09 15:52:41 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-05-09 15:52:41 -0700 |
| commit | de88da9c6b38922475b8bff671a8c8bb2a20710d (patch) | |
| tree | 6bf2bb59ea9c5a6064f75ad7d746298dee0afce6 | |
| parent | 92a9156970945a9cdc9bff861435ce46c8a0594b (diff) | |
| parent | 4e1ebfa17689e045b725e64bd75db044eb2abea6 (diff) | |
Merge pull request #6433 from murgatroid99/tools_package_bin_namespacing
Make namespacing of executables exposed by grpc-tools packages consistent between Node and Ruby
| -rw-r--r-- | src/node/tools/package.json | 4 | ||||
| -rwxr-xr-x | src/ruby/tools/bin/grpc_tools_ruby_protoc.rb (renamed from src/ruby/tools/bin/protoc.rb) | 0 | ||||
| -rwxr-xr-x | src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb (renamed from src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb) | 0 | ||||
| -rw-r--r-- | templates/src/node/tools/package.json.template | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/node/tools/package.json b/src/node/tools/package.json index efdfa81124..d4849c2e38 100644 --- 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" diff --git a/src/ruby/tools/bin/protoc.rb b/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb index 3a2a5b8dc9..3a2a5b8dc9 100755 --- a/src/ruby/tools/bin/protoc.rb +++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb diff --git a/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb index 4b296dedc7..4b296dedc7 100755 --- a/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb +++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb diff --git a/templates/src/node/tools/package.json.template b/templates/src/node/tools/package.json.template index 4f673c48d1..69ad71a3b8 100644 --- 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" |