Skip to content

Commit

Permalink
/usr/bin/code for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Mar 20, 2021
1 parent cad5687 commit 7f97f9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,10 @@
### Linux settings:

* Example arguments: `--diff "targetFile" "tempFile"`
* Scanned path: `/usr/local/bin/code`
* Scanned paths:

* `/usr/local/bin/code`
* `/usr/bin/code`


## [WinMerge](https://winmerge.org/)
Expand Down
3 changes: 2 additions & 1 deletion src/DiffEngine/Implementation/VsCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ static string Arguments(string temp, string target) =>
@"%ProgramFiles%\Microsoft VS Code\code.exe"),
linux: new(
Arguments,
"/usr/local/bin/code"),
"/usr/local/bin/code",
"/usr/bin/code"),
osx: new(
Arguments,
"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"),
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649</NoWarn>
<Version>6.6.0-beta.2</Version>
<Version>6.6.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>
Expand Down

0 comments on commit 7f97f9f

Please sign in to comment.