From 7fc8c2efa2d2c2efa741df68259efc5188df425e Mon Sep 17 00:00:00 2001 From: Lino Schmidt Date: Sat, 18 Jun 2022 23:23:05 +0200 Subject: [PATCH] Added multiplatform paths support --- package.json | 8 ++++---- src/components/paths.ts | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 55572c8..cca75e3 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "src/index.build.js", "src/index.html" ], - "extraFiles": [ + "extraResources": [ "dependencies/template.blend", "dependencies/blenderScript.py" ], @@ -41,7 +41,7 @@ "target": [ "nsis" ], - "extraFiles": [ + "extraResources": [ { "from": "dependencies/windows/", "to": "dependencies/windows/", @@ -64,7 +64,7 @@ "deb", "rpm" ], - "extraFiles": [ + "extraResources": [ { "from": "dependencies/linux/", "to": "dependencies/linux/", @@ -80,7 +80,7 @@ "target": [ "dmg" ], - "extraFiles": [ + "extraResources": [ { "from": "dependencies/darwin/", "to": "dependencies/darwin/", diff --git a/src/components/paths.ts b/src/components/paths.ts index d3dc90d..50c5de6 100644 --- a/src/components/paths.ts +++ b/src/components/paths.ts @@ -2,19 +2,20 @@ import path from 'path'; import {app} from '@electron/remote'; export const dataPath = app.getPath('userData'); +export const appPath = app.getAppPath().replace("app.asar", ""); export const SettingPath = path.join(dataPath, "settings.xml"); export const defaultOutputPath = path.join(app.getPath('videos'), "StickExporterTX"); let platformFolder = ""; -if(process.platform === "win32"){ +if(process.platform === "win32") { platformFolder = "windows"; -} else if(process.platform === "darwin"){ +} else if(process.platform === "darwin") { platformFolder = "darwin"; -} else if(process.platform === "linux"){ +} else if(process.platform === "linux") { platformFolder = "linux"; } -export const blenderPath = path.join("dependencies", platformFolder, "blender", "blender"); -export const templatePath = path.join("dependencies", "template.blend"); -export const blenderScriptPath = path.join("dependencies", "blenderScript.py"); \ No newline at end of file +export const blenderPath = path.join(appPath, "dependencies", platformFolder, "blender", "blender"); +export const templatePath = path.join(appPath, "dependencies", "template.blend"); +export const blenderScriptPath = path.join(appPath, "dependencies", "blenderScript.py"); \ No newline at end of file