Merge pull request #373 from dpogue/resouce-file-overwrite

CB-14141: Don't duplicate resource files in xcodeproj
apache · Sep 2, 2018 · ad96ef0 · ad96ef0
2 parents 9d2ea13 + e2c885f
commit ad96ef0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js
@@ -503,7 +503,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;
     });