FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix duplicate JS files in output

pull/2954/head
Gordon Williams 2023-08-07 11:31:26 +01:00
parent 34cb33f75f
commit dc3a49424e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/firmwaremaker_c.js
View File

@ -103,7 +103,15 @@ Promise.all(APPS.map(appid => {
var app = apploader.apps.find(a => a.id==appid);
if (!app) throw new Error(`App ${appid} not found`);
return apploader.getAppFiles(app).then(files => {
appfiles = appfiles.concat(files);
files.forEach(f => {
var existing = appfiles.find(a=> a.name==f.name);
if (existing) {
if (existing.content !== f.content)
throw new Error(`Duplicate file ${f.name} is different`)
} else {
appfiles.push(f);
}
});
});
})).then(() => {
// work out what goes in storage