Update loader script

Kyza · Kyza · commit 249f9bb6961c · 2022-05-03T15:40:49.000-04:00
diff --git a/frontend/modules/installer.ts b/frontend/modules/installer.ts
@@ -83,7 +83,17 @@ const files = [
     {
         name: "index.js",
         content() {
-            return `const path=require("path");require(path.join(require(path.join(__dirname,"package.json")).location,"kernel.asar"))?.default?.({startOriginal: true});`;
+            return `const pkg = require("./package.json");
+const Module = require("module");
+const path = require("path");
+
+try {
+  const kernel = require(path.join(pkg.location, "kernel.asar"));
+  if (kernel?.default) kernel.default({ startOriginal: true });
+} catch(e) {
+  console.error("Kernel failed to load: ", e.message);
+  Module._load(path.join(__dirname, "..", "app-original.asar"), null, true);
+}`;
         }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,17 @@ const files = [`
`83`	`83`	`{`
`84`	`84`	`name: "index.js",`
`85`	`85`	`content() {`
`86`		- return `const path=require("path");require(path.join(require(path.join(__dirname,"package.json")).location,"kernel.asar"))?.default?.({startOriginal: true});`;
	`86`	+ return `const pkg = require("./package.json");
	`87`	`+const Module = require("module");`
	`88`	`+const path = require("path");`
	`89`	`+`
	`90`	`+try {`
	`91`	`+ const kernel = require(path.join(pkg.location, "kernel.asar"));`
	`92`	`+ if (kernel?.default) kernel.default({ startOriginal: true });`
	`93`	`+} catch(e) {`
	`94`	`+ console.error("Kernel failed to load: ", e.message);`
	`95`	`+ Module._load(path.join(__dirname, "..", "app-original.asar"), null, true);`
	`96`	+}`;
`87`	`97`	`}`
`88`	`98`	`},`
`89`	`99`	`{`