From 87bb8c5c6471b5ed4e0b47f99172aa1f23dfa5ba Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 28 Jul 2024 16:33:25 +0300
Subject: [PATCH] Try new env var method

---
 .github/workflows/CI.yml | 2 +-
 unciv.wxs                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1122587..84586ab 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -29,7 +29,7 @@ jobs:
         
       - name: Build WiX on Windows
         run: | # Trying to set env variables for a simple command is like ???, now I truly understand the "Windows Sucks" mentality. 
-          # The space after the version is intentionally ommited, otherwise the env var contains a space. *sigh*
+          # The space after the version is intentionally omitted, otherwise the env var contains a space. *sigh*
           cmd /C "set UNCIV_VERSION=4.12.14&& wix build .\unciv.wxs"
           dir
         
diff --git a/unciv.wxs b/unciv.wxs
index a3c6322..8b06f02 100644
--- a/unciv.wxs
+++ b/unciv.wxs
@@ -32,7 +32,7 @@
           <Shortcut Id="StartMenuShortcut"
                     Name="$(var.Name)"
                     Target="[#UncivExe]"
-                    Arguments="--data-dir=[#APPDATAFOLDER]"
+                    Arguments="--data-dir=%APPDATA%\Unciv"
                     Icon="icon.ico"
                     Directory="ApplicationProgramsFolder"
                     WorkingDirectory="INSTALLFOLDER" />
@@ -52,7 +52,7 @@
         </Feature>
     
 
-        <StandardDirectory Id="ProgramFiles64Folder">
+        <StandardDirectory Id="ProgramFilesFolder">
             <Directory Id="INSTALLFOLDER" Name="$(var.InstallFolder)" />
         </StandardDirectory>