From 34a688050857ee29e413ec3baf833873d9c36bdf Mon Sep 17 00:00:00 2001 From: Tony Lu Date: Thu, 11 Jul 2019 18:31:51 -0700 Subject: [PATCH] Fixing formatting issues --- gRPC-Core.podspec | 12 ++---------- templates/gRPC-Core.podspec.template | 15 ++++----------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index f92b78f3fdf..2dfcb311b5d 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1387,15 +1387,7 @@ 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 -print0 | xargs -0 -L1 sed -E -i '' 's;#include "(pb(_.*)?\\.h)";#if COCOAPODS\\ - #include \\ -#else\\ - #include "\\1"\\ -#endif;g' - find src/core/ -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i '' 's;#include ;#if COCOAPODS\\ - #include \\ -#else\\ - #include \\ -#endif;g' + find src/core/ -type f -print0 | xargs -0 -L1 sed -E -i '' 's;#include "(pb(_.*)?\\.h)";#if COCOAPODS\\\n #include \\\n#else\\\n #include "\\1"\\\n#endif;g' + find src/core/ -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i '' 's;#include ;#if COCOAPODS\\\n #include \\\n#else\\\n #include \\\n#endif;g' END_OF_COMMAND end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index a22ce9c33e9..652c4ed43f0 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -211,15 +211,8 @@ end # 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 -print0 | xargs -0 -L1 sed -E -i '' 's;#include "(pb(_.*)?\\.h)";#if COCOAPODS\\ - #include \\ -#else\\ - #include "\\1"\\ -#endif;g' - find src/core/ -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i '' 's;#include ;#if COCOAPODS\\ - #include \\ -#else\\ - #include \\ -#endif;g' + s.prepare_command = <<-END_OF_COMMAND + find src/core/ -type f -print0 | xargs -0 -L1 sed -E -i '' 's;#include "(pb(_.*)?\\.h)";#if COCOAPODS\\\n #include \\\n#else\\\n #include "\\1"\\\n#endif;g' + find src/core/ -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i '' 's;#include ;#if COCOAPODS\\\n #include \\\n#else\\\n #include \\\n#endif;g' + END_OF_COMMAND end