ExeName for BeyondCompare on linux should be bcompare not bcomp (#426)

* ExeName for BeyondCompare on linux should be bcompare not bcomp * .
VerifyTests · Nov 14, 2023 · 2477ad0 · 2477ad0
1 parent 3bcfa3c
commit 2477ad0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/docs/diff-tool.md b/docs/diff-tool.md
@@ -129,7 +129,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
 #### Notes:
 
  * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
- * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. 
+ * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
 
 #### Windows settings:
 
@@ -154,8 +154,8 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `-solo -rightreadonly "targetFile.txt" "tempFile.txt" `
   * Example target on right arguments: `-solo -leftreadonly "tempFile.txt" "targetFile.txt" `
   * Scanned paths:
-    * `/usr/lib/beyondcompare/bcomp`
-    * `%PATH%bcomp`
+    * `/usr/bin/bcompare`
+    * `%PATH%bcompare`
 
 ### [DeltaWalker](https://www.deltawalker.com/)
 

diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md
@@ -16,7 +16,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
 #### Notes:
 
  * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
- * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. 
+ * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
 
 #### Windows settings:
 
@@ -41,8 +41,8 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `-solo -rightreadonly "targetFile.txt" "tempFile.txt" `
   * Example target on right arguments: `-solo -leftreadonly "tempFile.txt" "targetFile.txt" `
   * Scanned paths:
-    * `/usr/lib/beyondcompare/bcomp`
-    * `%PATH%bcomp`
+    * `/usr/bin/bcompare`
+    * `%PATH%bcompare`
 
 ### [DeltaWalker](https://www.deltawalker.com/)
 

diff --git a/src/DiffEngine/Implementation/BeyondCompare.cs b/src/DiffEngine/Implementation/BeyondCompare.cs
@@ -45,11 +45,11 @@ static string RightOsxLinuxArguments(string temp, string target) =>
                         RightWindowsArguments),
                     @"%ProgramFiles%\Beyond Compare *\"),
                 Linux: new(
-                    "bcomp",
+                    "bcompare",
                     new(
                         LeftOsxLinuxArguments,
                         RightOsxLinuxArguments),
-                    "/usr/lib/beyondcompare/"),
+                    "/usr/bin/"),
                 Osx: new(
                     "bcomp",
                     new(
@@ -58,7 +58,7 @@ static string RightOsxLinuxArguments(string temp, string target) =>
                     "/Applications/Beyond Compare.app/Contents/MacOS/")),
             Notes: """
                     * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
-                    * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. 
+                    * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
                    """);
     }
 }