From bc753c91d9d5cc927596b3d1a74cbb9105d73406 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Thu, 19 May 2022 14:03:26 -0400 Subject: [PATCH] Hopefully fix macos --- preload.js | 15 +++++++++++---- renderer.js | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/preload.js b/preload.js index 824c6b8..aa895c4 100644 --- a/preload.js +++ b/preload.js @@ -12,9 +12,16 @@ contextBridge.exposeInMainWorld("installPackage", async (link) => { cwd: packagesPath, }) - await exec("pnpm i --production", { - cwd: packagePath, - }) + await exec( + `${ + process.platform == "darwin" + ? path.join(process.env.HOME, "Library", "pnpm", "pnpm") + : "pnpm" + } i --production`, + { + cwd: packagePath, + } + ) try { await promises.access(join(packagePath, "main.js"), constants.F_OK) @@ -26,6 +33,6 @@ contextBridge.exposeInMainWorld("installPackage", async (link) => { return { reloadMessage: "Please reload discord with Ctrl+R" } } } catch (error) { - return { errorMessage: error } + return { error } } }) diff --git a/renderer.js b/renderer.js index 45f2d14..c3c9284 100644 --- a/renderer.js +++ b/renderer.js @@ -61,7 +61,7 @@ export default new (class PackageDownloader { onClick: async () => { setDisabled(true) - const { reloadMessage, errorMessage } = + const { reloadMessage, error } = await window.installPackage(gitURL) if (reloadMessage) { @@ -90,7 +90,7 @@ export default new (class PackageDownloader { ) ) pluginLog( - `Package installation failed: ${errorMessage}`, + `Package installation failed: ${error}`, console.error ) setDisabled(false)