feat: look for gfxexport in application directory instead of working …

…directory by default
glacier-modding · Jul 17, 2024 · f944852 · f944852
1 parent 64f0948
commit f944852
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
           name: win-x64
 
       - name: Download ResourceTool
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1.11
         with:
             repository: "OrfeasZ/ZHMTools"
             latest: true

diff --git a/G2GFxDataTool/G2GFxDataTool.csproj b/G2GFxDataTool/G2GFxDataTool.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <Copyright>Copyright (C) Glacier 2 Modding Organisation</Copyright>
+    <Version>1.1.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
 

diff --git a/G2GFxDataTool/Options.cs b/G2GFxDataTool/Options.cs
@@ -13,8 +13,8 @@ public class Options
         [Option('b', "base-assembly-path", SetName = "export", Required = false, HelpText = "Base assembly path (defaults to /ui/controls/).")]
         public string baseAssemblyPath { get; set; } = "/ui/controls/";
 
-        [Option('g', "gfxexport", SetName = "export", Required = false, HelpText = "Path to gfxexport.exe (defaults to \"gfxexport.exe\").")]
-        public string gfxexportPath { get; set; } = "gfxexport.exe";
+        [Option('g', "gfxexport", SetName = "export", Required = false, HelpText = "Path to gfxexport.exe (defaults to \"gfxexport.exe\" in the folder where G2GFxDataTool.exe is located).")]
+        public string gfxexportPath { get; set; } = AppDomain.CurrentDomain.BaseDirectory + "gfxexport.exe";
 
         [Option('s', "save-paths", SetName = "export", Required = false, HelpText = "Saves Scaleform GFx, UIControl and aspect paths to scaleformgfx.txt, uicontrol.txt and aspect.txt text files in the output directory.")]
         public bool savePaths { get; set; }