Determine base directory in a more reliable manner

geluk · Oct 17, 2022 · c3924fa · c3924fa
1 parent d391553
commit c3924fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/pass-winmenu-tests/Configuration/RuntimeConfigurationTests.cs b/pass-winmenu-tests/Configuration/RuntimeConfigurationTests.cs
@@ -7,11 +7,11 @@ namespace PassWinmenuTests.Configuration
 	public class RuntimeConfigurationTests
 	{
 		[Fact]
-		public void Parse_NoArgs_ConfigFileLocationIsNull()
+		public void Parse_NoArgs_SetsDefaultLocation()
 		{
 			var config = RuntimeConfiguration.Parse(new[] { "app.exe" });
 
-			config.ConfigFileLocation.ShouldBeNull();
+			config.ConfigFileLocation.ShouldEndWith("pass-winmenu.yaml");
 		}
 
 		[Fact]

diff --git a/pass-winmenu/src/Configuration/RuntimeConfiguration.cs b/pass-winmenu/src/Configuration/RuntimeConfiguration.cs
@@ -1,5 +1,5 @@
+using System;
 using System.IO;
-using System.Reflection;
 
 #nullable enable
 namespace PassWinmenu.Configuration
@@ -14,8 +14,8 @@ private RuntimeConfiguration()
 
 		internal static RuntimeConfiguration Parse(string[] args)
 		{
-			var executableDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location);
-			var defaultConfigPath = Path.Combine(executableDirectory!, "pass-winmenu.yaml");
+			var executableDirectory = AppDomain.CurrentDomain.BaseDirectory;
+			var defaultConfigPath = Path.Combine(executableDirectory, "pass-winmenu.yaml");
 
 			var configuration = new RuntimeConfiguration
 			{

diff --git a/pass-winmenu/src/Dependencies.cs b/pass-winmenu/src/Dependencies.cs
@@ -250,7 +250,7 @@ private void LoadConfigFile(RuntimeConfiguration runtimeConfig)
 															  "Would you like to open it now?", "New configuration file created", MessageBoxButton.YesNo);
 					if (open == MessageBoxResult.Yes)
 					{
-						Process.Start(runtimeConfig.ConfigFileLocation);
+						Process.Start("explorer", runtimeConfig.ConfigFileLocation);
 					}
 
 					App.Exit();
@@ -262,7 +262,7 @@ private void LoadConfigFile(RuntimeConfiguration runtimeConfig)
 																  "Would you like to open both files now?", "Configuration file out of date", MessageBoxButton.YesNo);
 					if (openBoth == MessageBoxResult.Yes)
 					{
-						Process.Start(runtimeConfig.ConfigFileLocation);
+						Process.Start("explorer", runtimeConfig.ConfigFileLocation);
 						Process.Start(backedUpFile);
 					}
 					App.Exit();

diff --git a/pass-winmenu/src/ExternalPrograms/Gpg/GpgHomeDirResolver.cs b/pass-winmenu/src/ExternalPrograms/Gpg/GpgHomeDirResolver.cs
@@ -45,7 +45,12 @@ public GpgHomeDirectory GetHomeDir()
 		/// </summary>
 		private string GetDefaultHomeDir()
 		{
-			var psi = new ProcessStartInfo(installation.GpgConfExecutable.FullName, "--list-dirs");
+			var psi = new ProcessStartInfo(installation.GpgConfExecutable.FullName, "--list-dirs")
+			{
+				RedirectStandardOutput = true,
+				UseShellExecute = false,
+			};
+
 			var gpgConf = processes.Start(psi);
 
 			var lines = gpgConf.StandardOutput.ReadAllLines();