From 8a8fed517cbad3b83c7d61c1e31ae32058bf824d Mon Sep 17 00:00:00 2001
From: KamaleiZestri <38802353+KamaleiZestri@users.noreply.github.com>
Date: Tue, 10 Feb 2026 14:14:20 -0600
Subject: [PATCH] Unify $winutildir (#4004)

---
 functions/private/Invoke-WinutilThemeChange.ps1    | 4 ++--
 functions/private/Set-PackageManagerPreference.ps1 | 4 ++--
 scripts/main.ps1                                   | 6 ------
 scripts/start.ps1                                  | 6 +++++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/functions/private/Invoke-WinutilThemeChange.ps1 b/functions/private/Invoke-WinutilThemeChange.ps1
index 0bf8f3fd..96fbdf36 100644
--- a/functions/private/Invoke-WinutilThemeChange.ps1
+++ b/functions/private/Invoke-WinutilThemeChange.ps1
@@ -129,8 +129,8 @@ function Invoke-WinutilThemeChange {
         }
     }
 
-    $LightPreferencePath = "$env:LOCALAPPDATA\winutil\LightTheme.ini"
-    $DarkPreferencePath = "$env:LOCALAPPDATA\winutil\DarkTheme.ini"
+    $LightPreferencePath = "$winutildir\LightTheme.ini"
+    $DarkPreferencePath = "$winutildir\DarkTheme.ini"
 
     if ($init) {
         Set-WinutilTheme -currentTheme "shared"
diff --git a/functions/private/Set-PackageManagerPreference.ps1 b/functions/private/Set-PackageManagerPreference.ps1
index 17bc7a7b..54a7b7be 100644
--- a/functions/private/Set-PackageManagerPreference.ps1
+++ b/functions/private/Set-PackageManagerPreference.ps1
@@ -14,8 +14,8 @@ function Set-PackageManagerPreference {
         [PackageManagers]$preferredPackageManager
     )
 
-    $preferencePath = "$env:LOCALAPPDATA\winutil\preferences.ini"
-    $oldChocoPath = "$env:LOCALAPPDATA\winutil\preferChocolatey.ini"
+    $preferencePath = "$winutildir\preferences.ini"
+    $oldChocoPath = "$winutildir\preferChocolatey.ini"
 
     #Try loading from file if no argument given.
     if ($null -eq $preferredPackageManager) {
diff --git a/scripts/main.ps1 b/scripts/main.ps1
index 5db0295e..1a253f58 100644
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@@ -425,12 +425,6 @@ $sync["Form"].Add_Loaded({
 $NavLogoPanel = $sync["Form"].FindName("NavLogoPanel")
 $NavLogoPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25)) | Out-Null
 
-# Initialize the hashtable
-$winutildir = @{}
-
-# Set the path for the winutil directory
-$winutildir = "$env:LocalAppData\winutil\"
-New-Item $winutildir -ItemType Directory -Force | Out-Null
 
 if (Test-Path "$winutildir\logo.ico") {
     $sync["logorender"] = "$winutildir\logo.ico"
diff --git a/scripts/start.ps1 b/scripts/start.ps1
index 92baa397..9dac2536 100644
--- a/scripts/start.ps1
+++ b/scripts/start.ps1
@@ -79,7 +79,11 @@ if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
 
 $dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
 
-$logdir = "$env:localappdata\winutil\logs"
+# Set the path for the winutil directory
+$winutildir = "$env:LocalAppData\winutil"
+New-Item $winutildir -ItemType Directory -Force | Out-Null
+
+$logdir = "$winutildir\logs"
 New-Item $logdir -ItemType Directory -Force | Out-Null
 Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append -NoClobber | Out-Null