From 38170905ca012ddd2d8e1cbaaeea3f50078840ec Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Wed, 19 Jan 2022 16:52:52 +0100
Subject: [PATCH] Port firmwaremake*.js to metadata.json

---
 bin/firmwaremaker.js   | 9 +++++----
 bin/firmwaremaker_c.js | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
index 4bc2a70b2..9f7758ee5 100755
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@@ -10,7 +10,6 @@ var SETTINGS = {
 var path = require('path');
 var ROOTDIR = path.join(__dirname, '..');
 var APPDIR = ROOTDIR+'/apps';
-var APPJSON = ROOTDIR+'/apps.json';
 var OUTFILE = ROOTDIR+'/firmware.js';
 var DEVICE = "BANGLEJS";
 var APPS = [ // IDs of apps to install
@@ -28,7 +27,6 @@ global.Const = {
 };
 
 var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
-var appjson = JSON.parse(fs.readFileSync(APPJSON).toString());
 var appfiles = [];
 
 function fileGetter(url) {
@@ -58,8 +56,11 @@ function fileGetter(url) {
 }
 
 Promise.all(APPS.map(appid => {
-  var app = appjson.find(app=>app.id==appid);
-  if (app===undefined) throw new Error(`App ${appid} not found`);
+  try {
+    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
+  } catch (e) {
+    throw new Error(`App ${appid} not found`);
+  }
   return AppInfo.getFiles(app, {
     fileGetter : fileGetter,
     settings : SETTINGS,
diff --git a/bin/firmwaremaker_c.js b/bin/firmwaremaker_c.js
index 14ced9ef8..e7042d2c3 100755
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@@ -16,7 +16,6 @@ var DEVICE = process.argv[2];
 var path = require('path');
 var ROOTDIR = path.join(__dirname, '..');
 var APPDIR = ROOTDIR+'/apps';
-var APPJSON = ROOTDIR+'/apps.json';
 var MINIFY = true;
 var OUTFILE, APPS;
 
@@ -86,7 +85,6 @@ function atob(input) {
   }
 
 var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
-var appjson = JSON.parse(fs.readFileSync(APPJSON).toString());
 var appfiles = [];
 
 function fileGetter(url) {
@@ -134,8 +132,11 @@ function evaluateFile(file) {
 }
 
 Promise.all(APPS.map(appid => {
-  var app = appjson.find(app=>app.id==appid);
-  if (app===undefined) throw new Error(`App ${appid} not found`);
+  try {
+    var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
+  } catch (e) {
+    throw new Error(`App ${appid} not found`);
+  }
   return AppInfo.getFiles(app, {
     fileGetter : fileGetter,
     settings : SETTINGS,