From 8b3610c5186c5f55fb2cbcdb913edcb3ed03dcf9 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sun, 30 Jun 2024 20:03:06 +0200 Subject: [PATCH] improve external binaries resolution --- packages/core/src/helpers/setup.js | 2 +- packages/core/src/vars.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/helpers/setup.js b/packages/core/src/helpers/setup.js index 826c4c6..edbdc97 100644 --- a/packages/core/src/helpers/setup.js +++ b/packages/core/src/helpers/setup.js @@ -69,7 +69,7 @@ export default async () => { await fs.promises.mkdir(path.resolve(Vars.binaries_path, prerequisite.id), { recursive: true }) if (typeof prerequisite.url === "function") { - prerequisite.url = await prerequisite.url(resolveOs(), os.arch()) + prerequisite.url = await prerequisite.url(os.platform(), os.arch()) Log.info(`Resolved url: ${prerequisite.url}`) } diff --git a/packages/core/src/vars.js b/packages/core/src/vars.js index 5e1bb65..f1f0b05 100644 --- a/packages/core/src/vars.js +++ b/packages/core/src/vars.js @@ -15,7 +15,7 @@ const binaries_path = upath.normalizeSafe(path.resolve(runtime_path, "binaries") const db_path = upath.normalizeSafe(path.resolve(runtime_path, "db.json")) const binaries = { - sevenzip_bin: upath.normalizeSafe(path.resolve(binaries_path, "7z-bin", isWin ? "7z.exe" : "7zz")), + sevenzip_bin: upath.normalizeSafe(path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7zz")), git_bin: upath.normalizeSafe(path.resolve(binaries_path, "git-bin", "bin", isWin ? "git.exe" : "git")), aria2_bin: upath.normalizeSafe(path.resolve(binaries_path, "aria2", isWin ? "aria2c.exe" : "aria2c")), java22_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java22_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),