From 53a5c730fafd1445a2904a3f6924008a2b5244a0 Mon Sep 17 00:00:00 2001 From: "Laszlo Boszormenyi (GCS)" Date: Fri, 24 Jul 2020 16:28:01 +0100 Subject: [PATCH] fix-protoc-path Gbp-Pq: Name fix-protoc-path.patch --- src/ruby/end2end/package_with_underscore_checker.rb | 4 ++-- src/ruby/tools/bin/grpc_tools_ruby_protoc | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ruby/end2end/package_with_underscore_checker.rb b/src/ruby/end2end/package_with_underscore_checker.rb index 27ea00ff..d4b3c044 100644 --- a/src/ruby/end2end/package_with_underscore_checker.rb +++ b/src/ruby/end2end/package_with_underscore_checker.rb @@ -21,10 +21,10 @@ def main fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG'] bins_sub_dir = ENV['CONFIG'] - bins_dir = File.join(root_dir, 'bins', bins_sub_dir) + bins_dir = '/usr/bin' plugin = File.join(bins_dir, 'grpc_ruby_plugin') - protoc = File.join(bins_dir, 'protobuf', 'protoc') + protoc = File.join(bins_dir, 'protoc') got = nil diff --git a/src/ruby/tools/bin/grpc_tools_ruby_protoc b/src/ruby/tools/bin/grpc_tools_ruby_protoc index 390c2d37..38ce1828 100755 --- a/src/ruby/tools/bin/grpc_tools_ruby_protoc +++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc @@ -23,8 +23,7 @@ protoc_name = 'protoc' + ext plugin_name = 'grpc_ruby_plugin' + ext -protoc_dir = File.join(File.dirname(__FILE__), - PLATFORM.architecture + '-' + PLATFORM.os_name) +protoc_dir = '/usr/bin' protoc_path = File.join(protoc_dir, protoc_name) -- 2.30.2