From cf7e99db969dba4a78b97d1a0cd5228cc8e6ec8c Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Fri, 29 Apr 2016 11:31:57 -0700 Subject: Fix cp -r usage to be portable. cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency. --- objectivec/generate_well_known_types.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'objectivec/generate_well_known_types.sh') 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/" -- cgit v1.2.3