diff options
author | 2015-07-07 13:44:45 -0700 | |
---|---|---|
committer | 2015-07-07 13:44:45 -0700 | |
commit | ce9c4ee6db4ac0e4252edc083842b8542420a37f (patch) | |
tree | 520b0c2d9ec3c1a9de51a8ab0d3429e4f5c663e7 /templates/gRPC.podspec.template | |
parent | 9188d7a2df8217aa9414113a215668118a0dd700 (diff) | |
parent | c5b5290bc6570a7226ed67d6884c374b236b48dc (diff) |
Merge branch 'not-everyone-can-be-included' into just-say-goodbye-when-we-are-done
Conflicts:
src/core/transport/chttp2_transport.c
Diffstat (limited to 'templates/gRPC.podspec.template')
-rw-r--r-- | templates/gRPC.podspec.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index deea07cee3..495ea49c9c 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -111,9 +111,9 @@ Pod::Spec.new do |s| BAD_TIME="$DIR_TIME/time.h" GOOD_TIME="$DIR_TIME/grpc_time.h" grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g - if [ -f "include/$BAD_TIME" ]; + if [ -f "$BAD_TIME" ]; then - mv -f "include/$BAD_TIME" "include/$GOOD_TIME" + mv -f "$BAD_TIME" "$GOOD_TIME" fi DIR_STRING="src/core/support" |