Merge 020eeefcae into b019f40802

Fix ForgeInstallerCLI path for cross-platform.
2024-12-22 03:32:12 -08:00 · 2023-10-14 04:54:35 +00:00 · 2023-10-14 13:29:15 +09:00
1 changed files with 3 additions and 2 deletions
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@ -556,10 +556,11 @@ async function dlAsync(login = true) {
    if(isDev) {
        wrapperPath = join(process.cwd(), 'libraries', 'java', 'ForgeInstallerCLI.jar')
    } else {
+        const exePath = remote.app.getPath('exe')
        if(process.platform === 'darwin'){
-            wrapperPath = join(process.cwd(), 'Contents', 'Resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
+            wrapperPath = join(exePath, '..', '..', 'Contents', 'Resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
        } else {
-            wrapperPath = join(process.cwd(), 'resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
+            wrapperPath = join(exePath, '..', 'resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
        }
    }
Author	SHA1	Message	Date
Kamesuta	28a30d2767	Merge `020eeefcae` into `b019f40802`	2023-10-14 04:54:35 +00:00
Kamesuta	020eeefcae	Fix ForgeInstallerCLI path for cross-platform.	2023-10-14 13:29:15 +09:00