From e2c885f9684d71b4d5f3c7a63a975095127edfb8 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 16 Jun 2018 22:14:34 -0700 Subject: [PATCH] CB-14141: Don't duplicate resource files in xcodeproj --- bin/templates/scripts/cordova/lib/prepare.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js index de345dd55..0a2daa423 100644 --- a/bin/templates/scripts/cordova/lib/prepare.js +++ b/bin/templates/scripts/cordova/lib/prepare.js @@ -497,7 +497,11 @@ function updateFileResources (cordovaProject, locations) { let targetPath = path.join(project.resources_dir, target); targetPath = path.relative(cordovaProject.root, targetPath); - project.xcode.addResourceFile(target); + if (!fs.existsSync(targetPath)) { + project.xcode.addResourceFile(target); + } else { + events.emit('warn', 'Overwriting existing resource file at ' + targetPath); + } resourceMap[targetPath] = src; });