git updater: Fix macOS (Vendicated#391)

Co-authored-by: Ven <[email protected]>
sunnniee · Jan 13, 2023 · 6329499 · 6329499
1 parent 32cdb63
commit 6329499
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ node_modules
 vencord_installer
 
 .idea
+.DS_Store
 
 yarn.lock
 package-lock.json

diff --git a/src/ipcMain/updater/git.ts b/src/ipcMain/updater/git.ts
@@ -30,6 +30,8 @@ const execFile = promisify(cpExecFile);
 
 const isFlatpak = Boolean(process.env.FLATPAK_ID?.includes("discordapp") || process.env.FLATPAK_ID?.includes("Discord"));
 
+if (process.platform === "darwin") process.env.PATH = `/usr/local/bin:${process.env.PATH}`;
+
 function git(...args: string[]) {
     const opts = { cwd: VENCORD_SRC_DIR };
 
@@ -66,10 +68,10 @@ async function pull() {
 async function build() {
     const opts = { cwd: VENCORD_SRC_DIR };
 
-    let res;
+    const command = isFlatpak ? "flatpak-spawn" : "node";
+    const args = isFlatpak ? ["--host", "node", "scripts/build/build.mjs"] : ["scripts/build/build.mjs"];
 
-    if (isFlatpak) res = await execFile("flatpak-spawn", ["--host", "node", "scripts/build/build.mjs"], opts);
-    else res = await execFile("node", ["scripts/build/build.mjs"], opts);
+    const res = await execFile(command, args, opts);
 
     return !res.stderr.includes("Build failed");
 }