Merge pull request #414 from oblivioncth/bugfix/abs_ext_fp_path

Resolve absolute Flashpoint path for services/extensions
FlashpointProject · Nov 16, 2023 · 13b432b · 13b432b
2 parents aba5c4f + 239e1a3
commit 13b432b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/back/extensions/util.ts b/src/back/extensions/util.ts
@@ -13,7 +13,7 @@ export async function parseAppVar(extId: string, appPath: string, launchCommand:
       case 'arch': return process.arch;
       case 'launchCommand': return launchCommand;
       case 'cwd': return fixSlashes(process.cwd());
-      case 'fpPath': return state.config ? fixSlashes(state.config.flashpointPath) : '';
+      case 'fpPath': return state.config ? path.resolve(fixSlashes(state.config.flashpointPath)) : '';
       case 'proxy': return state.preferences.browserModeProxy || '';
       default: {
         if (name.startsWith('extConf:')) {

diff --git a/src/shared/Util.ts b/src/shared/Util.ts
@@ -351,7 +351,7 @@ export function parseVarStr(str: string, config?: AppConfigData) {
   return parseVariableString(str, (name) => {
     switch (name) {
       case 'cwd': return fixSlashes(process.cwd());
-      case 'fpPath': return config ? fixSlashes(config.flashpointPath) : '';
+      case 'fpPath': return config ? path.resolve(fixSlashes(config.flashpointPath)) : '';
       default: return '';
     }
   });