Merge pull request grpc#6433 from murgatroid99/tools_package_bin_name…

…spacing Make namespacing of executables exposed by grpc-tools packages consistent between Node and Ruby
ojh3636 · May 9, 2016 · de88da9 · de88da9
2 parents 92a9156 + 4e1ebfa
commit de88da9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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 → src/ruby/tools/bin/grpc_tools_ruby_protoc.rb b/src/ruby/tools/bin/protoc.rb → src/ruby/tools/bin/grpc_tools_ruby_protoc.rb
diff --git a/...ruby/tools/bin/protoc_grpc_ruby_plugin.rb → ...ools/bin/grpc_tools_ruby_protoc_plugin.rb b/...ruby/tools/bin/protoc_grpc_ruby_plugin.rb → ...ools/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
@@ -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"