apppath: introduce ICommandContext.InstallationDirectory

Introduce a new property on the ICommandContext that represents the GCM
installation directory, separate from the application executable path.

The app executable is not always found in the installation directory if
the app exe path is a symlink (or we're a .NET tool where the AppHost is
outside of the tool store).

Author: mjcheetham

src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs

@@ -46,7 +46,8 @@ private static void AppMain(object o)
             string[] args = (string[]) o;
 
             string appPath = ApplicationBase.GetEntryApplicationPath();
-            using (var context = new CommandContext(appPath))
+            string installDir = ApplicationBase.GetInstallationDirectory();
+            using (var context = new CommandContext(appPath, installDir))
             using (var app = new HelperApplication(context))
             {
                 app.RegisterCommand(new CredentialsCommandImpl(context));

src/shared/Core/Application.cs

@@ -97,6 +97,7 @@ protected override async Task<int> RunInternalAsync(string[] args)
             Context.Trace.WriteLine($"Platform: {info.OperatingSystemType} ({info.CpuArchitecture})");
             Context.Trace.WriteLine($"OSVersion: {info.OperatingSystemVersion}");
             Context.Trace.WriteLine($"AppPath: {Context.ApplicationPath}");
+            Context.Trace.WriteLine($"InstallDir: {Context.InstallationDirectory}");
             Context.Trace.WriteLine($"Arguments: {string.Join(" ", args)}");
 
             var parser = new CommandLineBuilder(rootCommand)
@@ -252,25 +253,13 @@ Task IConfigurableComponent.UnconfigureAsync(ConfigurationTarget target)
                 }
 
                 // Clear app entry
-                config.UnsetAll(configLevel, helperKey, Regex.Escape(appPath));
+                string appEntryValue = currentValues[appIndex];
+                config.UnsetAll(configLevel, helperKey, Regex.Escape(appEntryValue));
             }
 
             return Task.CompletedTask;
         }
 
-        private string GetGitConfigAppName()
-        {
-            const string gitCredentialPrefix = "git-credential-";
-
-            string appName = Path.GetFileNameWithoutExtension(Context.ApplicationPath);
-            if (appName != null && appName.StartsWith(gitCredentialPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return appName.Substring(gitCredentialPrefix.Length);
-            }
-
-            return Context.ApplicationPath;
-        }
-
         private string GetGitConfigAppPath()
         {
             string path = Context.ApplicationPath;

src/shared/Core/ApplicationBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -83,18 +84,14 @@ public Task<int> RunAsync(string[] args)
 
         public static string GetEntryApplicationPath()
         {
-            string argv0 = PlatformUtils.GetNativeArgv0()
-                           ?? Process.GetCurrentProcess().MainModule?.FileName
-                           ?? Environment.GetCommandLineArgs()[0];
-
-            if (Path.IsPathRooted(argv0))
-            {
-                return argv0;
-            }
+            return PlatformUtils.GetNativeArgv0() ??
+                   Process.GetCurrentProcess().MainModule?.FileName ??
+                   Environment.GetCommandLineArgs()[0];
+        }
 
-            return Path.GetFullPath(
-                Path.Combine(Environment.CurrentDirectory, argv0)
-            );
+        public static string GetInstallationDirectory()
+        {
+            return Path.GetDirectoryName(Environment.GetCommandLineArgs()[0]);
         }
 
         /// <summary>

src/shared/Core/Authentication/AuthenticationBase.cs

@@ -166,7 +166,7 @@ protected bool TryFindHelperCommand(string envar, string configName, string defa
             //
             // Search the installation directory for an in-box helper
             //
-            string appDir = Path.GetDirectoryName(Context.ApplicationPath);
+            string appDir = Context.InstallationDirectory;
             string inBoxExePath = Path.Combine(appDir, PlatformUtils.IsWindows() ? $"{helperName}.exe" : helperName);
             string inBoxDllPath = Path.Combine(appDir, $"{helperName}.dll");
 

src/shared/Core/CommandContext.cs

@@ -17,6 +17,11 @@ public interface ICommandContext : IDisposable
         /// </summary>
         string ApplicationPath { get; }
 
+        /// <summary>
+        /// Absolute path to the Git Credential Manager installation directory.
+        /// </summary>
+        string InstallationDirectory { get; }
+
         /// <summary>
         /// Settings and configuration for Git Credential Manager.
         /// </summary>
@@ -73,11 +78,13 @@ public interface ICommandContext : IDisposable
     /// </summary>
     public class CommandContext : DisposableObject, ICommandContext
     {
-        public CommandContext(string appPath)
+        public CommandContext(string appPath, string installDir)
         {
             EnsureArgument.NotNullOrWhiteSpace(appPath, nameof (appPath));
 
             ApplicationPath = appPath;
+            InstallationDirectory = installDir;
+
             Streams = new StandardStreams();
             Trace   = new Trace();
 
@@ -172,6 +179,8 @@ private static string GetGitPath(IEnvironment environment, IFileSystem fileSyste
 
         public string ApplicationPath { get; }
 
+        public string InstallationDirectory { get; }
+
         public ISettings Settings { get; }
 
         public IStandardStreams Streams { get; }

src/shared/Core/Commands/DiagnoseCommand.cs

@@ -83,7 +83,8 @@ private async Task<int> ExecuteAsync(string output)
             using var fullLog = new StreamWriter(logFilePath, append: false, Encoding.UTF8);
             fullLog.WriteLine("Diagnose log at {0:s}Z", DateTime.UtcNow);
             fullLog.WriteLine();
-            fullLog.WriteLine($"Executable: {_context.ApplicationPath}");
+            fullLog.WriteLine($"AppPath: {_context.ApplicationPath}");
+            fullLog.WriteLine($"InstallDir: {_context.InstallationDirectory}");
             fullLog.WriteLine(
                 TryGetAssemblyVersion(out string version)
                     ? $"Version: {version}"

src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs

@@ -43,7 +43,8 @@ private static void AppMain(object o)
             string[] args = (string[]) o;
 
             string appPath = ApplicationBase.GetEntryApplicationPath();
-            using (var context = new CommandContext(appPath))
+            string installDir = ApplicationBase.GetInstallationDirectory();
+            using (var context = new CommandContext(appPath, installDir))
             using (var app = new HelperApplication(context))
             {
                 app.RegisterCommand(new CredentialsCommandImpl(context));

src/shared/Git-Credential-Manager/Program.cs

@@ -12,7 +12,8 @@ public static class Program
         public static void Main(string[] args)
         {
             string appPath = ApplicationBase.GetEntryApplicationPath();
-            using (var context = new CommandContext(appPath))
+            string installDir = ApplicationBase.GetInstallationDirectory();
+            using (var context = new CommandContext(appPath, installDir))
             using (var app = new Application(context))
             {
                 // Workaround for https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/2560

src/shared/GitHub.UI.Avalonia/Program.cs

@@ -45,7 +45,8 @@ private static void AppMain(object o)
             string[] args = (string[]) o;
 
             string appPath = ApplicationBase.GetEntryApplicationPath();
-            using (var context = new CommandContext(appPath))
+            string installDir = ApplicationBase.GetInstallationDirectory();
+            using (var context = new CommandContext(appPath, installDir))
             using (var app = new HelperApplication(context))
             {
                 app.RegisterCommand(new CredentialsCommandImpl(context));

src/shared/GitLab.UI.Avalonia/Program.cs

@@ -45,7 +45,8 @@ private static void AppMain(object o)
             string[] args = (string[]) o;
 
             string appPath = ApplicationBase.GetEntryApplicationPath();
-            using (var context = new CommandContext(appPath))
+            string installDir = ApplicationBase.GetInstallationDirectory();
+            using (var context = new CommandContext(appPath, installDir))
             using (var app = new HelperApplication(context))
             {
                 app.RegisterCommand(new CredentialsCommandImpl(context));