From 0e90fe7de91f09b1bb88a179396f4050057805c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Sat, 10 Jul 2021 10:24:52 +0200 Subject: [PATCH] Add support for apps installed with scoop (https://scoop.sh/) (#237) * BeyondCompare * Diffinity --- src/DiffEngine/Implementation/BeyondCompare.cs | 2 +- src/DiffEngine/Implementation/Diffinity.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/DiffEngine/Implementation/BeyondCompare.cs b/src/DiffEngine/Implementation/BeyondCompare.cs index 5acb61c8..f9d7dde1 100644 --- a/src/DiffEngine/Implementation/BeyondCompare.cs +++ b/src/DiffEngine/Implementation/BeyondCompare.cs @@ -43,7 +43,7 @@ static string OsxLinuxArguments(string temp, string target) => "tiff", "rtf" }, - windows: new(WindowsArguments, @"%ProgramFiles%\Beyond Compare *\BCompare.exe"), + windows: new(WindowsArguments, @"%ProgramFiles%\Beyond Compare *\BCompare.exe", @"%UserProfile%\scoop\apps\beyondcompare\current\BCompare.exe"), linux: new(OsxLinuxArguments, "/usr/lib/beyondcompare/bcomp"), osx: new(OsxLinuxArguments, "/Applications/Beyond Compare.app/Contents/MacOS/bcomp"), notes: @" diff --git a/src/DiffEngine/Implementation/Diffinity.cs b/src/DiffEngine/Implementation/Diffinity.cs index 27140cfb..7db3e68a 100644 --- a/src/DiffEngine/Implementation/Diffinity.cs +++ b/src/DiffEngine/Implementation/Diffinity.cs @@ -16,7 +16,8 @@ public static Definition Diffinity() binaryExtensions: Array.Empty(), windows: new( (temp, target) => $"\"{temp}\" \"{target}\"", - @"%ProgramFiles%\Diffinity\Diffinity.exe"), + @"%ProgramFiles%\Diffinity\Diffinity.exe", + @"%UserProfile%\scoop\apps\diffinity\current\Diffinity.exe"), notes: @" * Disable single instance: \ Preferences \ Tabs \ uncheck `Use single instance and open new diffs in tabs`.");