From 239e1a3480c91864fd58abcbfad6f1e28f56f32a Mon Sep 17 00:00:00 2001
From: Christian Heimlich <chris@pcserenity.com>
Date: Tue, 14 Nov 2023 17:35:37 -0500
Subject: [PATCH] Resolve absolute Flashpoint path for services/extensions

---
 src/back/extensions/util.ts | 2 +-
 src/shared/Util.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/back/extensions/util.ts b/src/back/extensions/util.ts
index 4df9cba89..1592f3aca 100644
--- 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
index 7679cc720..11525044b 100644
--- 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 '';
     }
   });