From 1450fd5ee0ed9255960b17175f65b583af3ca540 Mon Sep 17 00:00:00 2001 From: Daniel Alm Date: Thu, 8 Mar 2018 09:32:07 +0100 Subject: [PATCH 1/2] Podspec: Avoid running `sed` on the backup files it created itself. See #14457 for details. --- gRPC-Core.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 6c6c76991cd..df1d23749b7 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1115,6 +1115,6 @@ Pod::Spec.new do |s| # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path? s.prepare_command = <<-END_OF_COMMAND - find src/core/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; END_OF_COMMAND end From 40beafa2ee8797399748d9aef0b2df79c4e3645a Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 8 Mar 2018 15:36:33 -0800 Subject: [PATCH 2/2] Put change in template file --- templates/gRPC-Core.podspec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index c28b78dbdfc..24a0888e061 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -202,6 +202,6 @@ # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path? s.prepare_command = <<-END_OF_COMMAND - find src/core/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; END_OF_COMMAND end