diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog index 3f406e6a1..ef437fe3b 100644 --- a/apps/boot/ChangeLog +++ b/apps/boot/ChangeLog @@ -48,3 +48,4 @@ 0.42: Sort *.boot.js files lexically and by optional numeric priority, e.g. appname..boot.js 0.43: Fix Gadgetbridge handling with Programmable:off 0.44: Write .boot0 without ever having it all in RAM (fix Bangle.js 1 issues with BTHRM) +0.45: Fix 0.44 regression (auto-add semi-colon between each boot code chunk) diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js index 8eaeaf095..c2ed5458d 100644 --- a/apps/boot/bootupdate.js +++ b/apps/boot/bootupdate.js @@ -213,7 +213,7 @@ var bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{ var fileSize = boot.length + bootPost.length; bootFiles.forEach(bootFile=>{ // match the size of data we're adding below in bootFiles.forEach - fileSize += 2+bootFile.length+1+require('Storage').read(bootFile).length+1; + fileSize += 2+bootFile.length+1+require('Storage').read(bootFile).length+2; }); // write file in chunks (so as not to use up all RAM) require('Storage').write('.boot0',boot,0,fileSize); @@ -231,8 +231,8 @@ bootFiles.forEach(bootFile=>{ var bf = require('Storage').read(bootFile); require('Storage').write('.boot0',bf,fileOffset); fileOffset+=bf.length; - require('Storage').write('.boot0',"\n",fileOffset); - fileOffset+=1; + require('Storage').write('.boot0',";\n",fileOffset); + fileOffset+=2; }); require('Storage').write('.boot0',bootPost,fileOffset); diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json index a4fa875fa..c21ab6833 100644 --- a/apps/boot/metadata.json +++ b/apps/boot/metadata.json @@ -1,7 +1,7 @@ { "id": "boot", "name": "Bootloader", - "version": "0.44", + "version": "0.45", "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings", "icon": "bootloader.png", "type": "bootloader",