Merge pull request #1198 from klundberg/master

Fix for when the copy resources script fails at the rm command.

lib/cocoapods/generator/copy_resources_script.rb

@@ -117,7 +117,7 @@ EOS
       RSYNC_CALL = <<EOS
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"
 EOS
 
     end

spec/integration/install_add_pod/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_external_source/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_local_source/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_new/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_podspec/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_remove_pod/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"

spec/integration/update/after/Pods/Pods-resources.sh

@@ -33,4 +33,4 @@ install_resource()
 }
 
 rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rm "$RESOURCES_TO_COPY"
+rm -f "$RESOURCES_TO_COPY"