diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-04-29 14:37:53 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-04-29 14:37:53 -0400 |
| commit | aed7b345fa7a6e54b76773a987dc5a31f88a0342 (patch) | |
| tree | 5365a743acebc97c3dab90108c33a0eecf0b0e09 | |
| parent | b53417c7356deab70f44b60bd7e6270023ddc3b6 (diff) | |
| parent | cf7e99db969dba4a78b97d1a0cd5228cc8e6ec8c (diff) | |
| download | protobuf-aed7b345fa7a6e54b76773a987dc5a31f88a0342.tar.gz protobuf-aed7b345fa7a6e54b76773a987dc5a31f88a0342.tar.bz2 protobuf-aed7b345fa7a6e54b76773a987dc5a31f88a0342.zip | |
Merge pull request #1474 from pherl/fixscript
Fix cp -r usage to be portable.
| -rwxr-xr-x | objectivec/generate_well_known_types.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objectivec/generate_well_known_types.sh b/objectivec/generate_well_known_types.sh index 73be50ff..36c34603 100755 --- a/objectivec/generate_well_known_types.sh +++ b/objectivec/generate_well_known_types.sh @@ -73,4 +73,4 @@ fi # Copy them over. echo "Copying over updated WellKnownType sources." -cp -r "${TMP_DIR}/google/" "${ProtoRootDir}/objectivec/google/" +cp -r "${TMP_DIR}/google/." "${ProtoRootDir}/objectivec/google/" |