Merge pull request #1323 from nschum/frameworkrsync

Fix "cannot overwrite directory" when copying OS X frameworks into the resources dir

CHANGELOG.md

@@ -49,6 +49,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Xcodeproj#83](https://github.com/CocoaPods/Xcodeproj/pull/83)  
   [Ashton-W](https://github.com/Ashton-W)
 
+* OS X frameworks are now copied to the Resources folder using rsync to
+  properly overwrite existing files.  
+  [Nikolaj Schumacher](https://github.com/nschum)
+  [#1063](https://github.com/CocoaPods/CocoaPods/issues/1063)
 
 ## 0.23.0
 

lib/cocoapods/generator/copy_resources_script.rb

@@ -98,8 +98,8 @@ install_resource()
     *.framework)
       echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "cp -fpR ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      cp -fpR "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
       echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\\""