From 4cbdef43a1b305dc3cd4e22caf02fa419a7c48de Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 4 Oct 2025 09:52:01 +1000 Subject: [PATCH 1/2] fix ExamDiff path detection --- src/DiffEngine.Tests/diffTools.include.md | 6 +++--- src/DiffEngine/Implementation/ExamDiff.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 9d64324b..6ca28f9f 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -163,9 +163,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a "tempFile.txt" "targetFile.txt" /nh /diffonly /dn1:tempFile.txt /dn2:targetFile.txt ``` * Scanned paths: - * `%ProgramFiles%\ExamDiff Pro\ExamDiff.exe` - * `%ProgramW6432%\ExamDiff Pro\ExamDiff.exe` - * `%ProgramFiles(x86)%\ExamDiff Pro\ExamDiff.exe` + * `%ProgramFiles%\ExamDiff Pro*\ExamDiff.exe` + * `%ProgramW6432%\ExamDiff Pro*\ExamDiff.exe` + * `%ProgramFiles(x86)%\ExamDiff Pro*\ExamDiff.exe` * `%PATH%ExamDiff.exe` ### [Guiffy](https://www.guiffy.com/) diff --git a/src/DiffEngine/Implementation/ExamDiff.cs b/src/DiffEngine/Implementation/ExamDiff.cs index d2fc5cc7..415f0025 100644 --- a/src/DiffEngine/Implementation/ExamDiff.cs +++ b/src/DiffEngine/Implementation/ExamDiff.cs @@ -30,7 +30,7 @@ static string RightArguments(string temp, string target) Windows: new( "ExamDiff.exe", new(LeftArguments, RightArguments), - @"%ProgramFiles%\ExamDiff Pro\")), + @"%ProgramFiles%\ExamDiff Pro*\")), Notes: """ * [Command line reference](https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options) * `/nh`: do not add files or directories to comparison history From eb11ffbf48f8e7eb7e8bc67a6da4c9c83997bc70 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 4 Oct 2025 09:52:16 +1000 Subject: [PATCH 2/2] Update diff-tool.md --- docs/diff-tool.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 4d54317e..686df17f 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -298,9 +298,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a "tempFile.txt" "targetFile.txt" /nh /diffonly /dn1:tempFile.txt /dn2:targetFile.txt ``` * Scanned paths: - * `%ProgramFiles%\ExamDiff Pro\ExamDiff.exe` - * `%ProgramW6432%\ExamDiff Pro\ExamDiff.exe` - * `%ProgramFiles(x86)%\ExamDiff Pro\ExamDiff.exe` + * `%ProgramFiles%\ExamDiff Pro*\ExamDiff.exe` + * `%ProgramW6432%\ExamDiff Pro*\ExamDiff.exe` + * `%ProgramFiles(x86)%\ExamDiff Pro*\ExamDiff.exe` * `%PATH%ExamDiff.exe` ### [Guiffy](https://www.guiffy.com/)