From 2335a64c03c0220c46558dd9d921dafdcd08e8f8 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 2 Aug 2026 22:35:24 +0100
Subject: [PATCH] Refactor Windows path handling for application data
 directories

- Updated multiple files to consistently use `os.homedir()` for constructing the local application data path, improving compatibility and clarity across the codebase.
- This change enhances the reliability of directory retrieval for Windows environments.
---
 public/winappupdate.js        |  4 +++-
 src/desktop/deeplink-ipc.js   | 10 +++++++---
 src/desktop/updater-runner.js |  4 +++-
 src/desktop/winappupdate.js   |  4 +++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/public/winappupdate.js b/public/winappupdate.js
index ba9fd36..db12610 100644
--- a/public/winappupdate.js
+++ b/public/winappupdate.js
@@ -147,7 +147,9 @@ const isValidMsiPackage = async (filePath) => {
 const prepareInstallerPath = async (installerPath) => {
   const fileName = path.basename(installerPath)
   const updateDir = path.join(
-    process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'),
+    os.homedir(),
+    'AppData',
+    'Local',
     'FarmControl',
     'Updates'
   )
diff --git a/src/desktop/deeplink-ipc.js b/src/desktop/deeplink-ipc.js
index 3ef2b54..d037192 100644
--- a/src/desktop/deeplink-ipc.js
+++ b/src/desktop/deeplink-ipc.js
@@ -19,9 +19,13 @@ const PIPE_RETRY_DELAY_MS = 100
 
 export function getInstanceDir() {
   if (process.platform === 'win32') {
-    const localAppData =
-      process.env.LOCALAPPDATA || join(os.homedir(), 'AppData', 'Local')
-    return join(localAppData, 'com.tombutcher.farmcontrol', 'instance')
+    return join(
+      os.homedir(),
+      'AppData',
+      'Local',
+      'com.tombutcher.farmcontrol',
+      'instance'
+    )
   }
 
   return join(process.env.TMPDIR || '/tmp', 'com.tombutcher.farmcontrol', 'instance')
diff --git a/src/desktop/updater-runner.js b/src/desktop/updater-runner.js
index c320cd0..c4013e4 100644
--- a/src/desktop/updater-runner.js
+++ b/src/desktop/updater-runner.js
@@ -121,7 +121,9 @@ const spawnDetachedMacRestart = ({ appLaunchPath, parentPid }) => {
 
 const spawnDetachedWindowsRestart = ({ appLaunchPath, parentPid }) => {
   const updateDir = path.join(
-    process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'),
+    os.homedir(),
+    'AppData',
+    'Local',
     'FarmControl',
     'Updates'
   )
diff --git a/src/desktop/winappupdate.js b/src/desktop/winappupdate.js
index d19ff54..d8b516c 100644
--- a/src/desktop/winappupdate.js
+++ b/src/desktop/winappupdate.js
@@ -147,7 +147,9 @@ const isValidMsiPackage = async (filePath) => {
 export const prepareInstallerPath = async (installerPath) => {
   const fileName = path.basename(installerPath)
   const updateDir = path.join(
-    process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'),
+    os.homedir(),
+    'AppData',
+    'Local',
     'FarmControl',
     'Updates'
   )