bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes for last commit, rename 'clockApp' to make name conflicts even less likely

master
Gordon Williams 2022-10-21 11:42:18 +01:00
parent a8d7b7c09a
commit 48d9367e2f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/boot/bootloader.js
View File

@ -1,8 +1,8 @@
// This runs after a 'fresh' boot // This runs after a 'fresh' boot
var s = require("Storage").readJSON("setting.json",1)||{}; var s = require("Storage").readJSON("setting.json",1)||{};
var clockApp = require("Storage").read(s.clock); var _clkApp = require("Storage").read(s.clock);
if (!clockApp) { if (!_clkApp) {
clockApp = require("Storage").list(/\.info$/) _clkApp = require("Storage").list(/\.info$/)
.map(file => { .map(file => {
const app = require("Storage").readJSON(file,1); const app = require("Storage").readJSON(file,1);
if (app && app.type == "clock") { if (app && app.type == "clock") {
@ -11,13 +11,13 @@ if (!clockApp) {
}) })
.filter(x=>x) .filter(x=>x)
.sort((a, b) => a.sortorder - b.sortorder)[0]; .sort((a, b) => a.sortorder - b.sortorder)[0];
if (clockApp){ if (_clkApp){
clockApp = require("Storage").read(clockApp.src); s.clock = _clkApp.src;
s.clock = clockApp.src; _clkApp = require("Storage").read(_clkApp.src);
require("Storage").writeJSON("setting.json", s); require("Storage").writeJSON("setting.json", s);
} }
} }
if (!clockApp) clockApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
eval(clockApp);
delete s; delete s;
delete clockApp; if (!_clkApp) _clkApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
eval(_clkApp);
delete _clkApp;