Avoid no-op of replacing ADB daemon when on path

Author: Lauriethefish

QuestPatcher.Core/AndroidDebugBridge.cs

@@ -139,7 +139,9 @@ private async Task<bool> SetAdbPathIfValid(string adbExecutablePath)
             try
             {
                 Log.Verbose("Checking if ADB at {AdbPath} is present and up-to-date", adbExecutablePath);
-                string output = (await ProcessUtil.InvokeAndCaptureOutput(adbExecutablePath, "version")).AllOutput;
+                var outputInfo = await ProcessUtil.InvokeAndCaptureOutput(adbExecutablePath, "version");
+                string output = outputInfo.AllOutput;
+
                 Log.Debug("Output from checking ADB version: {VerisonOutput}", output);
 
                 int prefixPos = output.IndexOf(VersionPrefix);
@@ -168,7 +170,7 @@ private async Task<bool> SetAdbPathIfValid(string adbExecutablePath)
                 {
                     if (semver >= MinAdbVersion)
                     {
-                        _adbPath = adbExecutablePath;
+                        _adbPath = outputInfo.FullPath ?? adbExecutablePath;
                         return true;
                     }
                 }

QuestPatcher.Core/ProcessUtil.cs

@@ -28,6 +28,13 @@ public struct ProcessOutput
         /// The exit code of the process
         /// </summary>
         public int ExitCode { get; set; }
+
+        /// <summary>
+        /// The full path to the executable that was invoked.
+        /// Useful if running an executable on the PATH environnment variable.
+        /// May be null if this information was unavailable.
+        /// </summary>
+        public string? FullPath { get; set; }
     }
 
     public static class ProcessUtil
@@ -69,6 +76,7 @@ public static async Task<ProcessOutput> InvokeAndCaptureOutput(string fileName,
             };
 
             process.Start();
+            string? fullPath = process.MainModule?.FileName;
             process.BeginOutputReadLine();
             process.BeginErrorReadLine();
 
@@ -78,7 +86,8 @@ public static async Task<ProcessOutput> InvokeAndCaptureOutput(string fileName,
             {
                 StandardOutput = standardOutputBuilder.ToString(),
                 ErrorOutput = errorOutputBuilder.ToString(),
-                ExitCode = process.ExitCode
+                ExitCode = process.ExitCode,
+                FullPath = fullPath
             };
         }
     }