Differences
This shows you the differences between the selected revisions of the page.
| 2024-03-25 | 2026-01-05 (current) | ||
| list TortoiseMerge (martin) | Issue 2417 – Support Beyond Compare 5 in Compare Files extension + forward compatibility with 64-bit winscp (martin) | ||
| Line 14: | Line 14: | ||
| # @flag ShowResultsInMsgBox | # @flag ShowResultsInMsgBox | ||
| # @flag ApplyToDirectories | # @flag ApplyToDirectories | ||
| - | # @version 2 | + | # @version 3 |
| # @shortcut Shift+Ctrl+Alt+C | # @shortcut Shift+Ctrl+Alt+C | ||
| # @homepage ~~SELF~~ | # @homepage ~~SELF~~ | ||
| Line 37: | Line 37: | ||
| $tools = ( | $tools = ( | ||
| ("ExamDiff Pro", "$pf\ExamDiff Pro\ExamDiff.exe"), | ("ExamDiff Pro", "$pf\ExamDiff Pro\ExamDiff.exe"), | ||
| - | ("Beyond Compare", "$pf\Beyond Compare 4\BCompare.exe"), | + | ("Beyond Compare", ("$pf\Beyond Compare 5\BCompare.exe", "$pf\Beyond Compare 4\BCompare.exe")), |
| ("KDiff3", "$pf\KDiff3\kdiff3.exe"), | ("KDiff3", "$pf\KDiff3\kdiff3.exe"), | ||
| ("WinMerge", "$pf\WinMerge\WinMergeU.exe"), | ("WinMerge", "$pf\WinMerge\WinMergeU.exe"), | ||
| Line 53: | Line 53: | ||
| { | { | ||
| $path = $Null | $path = $Null | ||
| - | $tpath = $t[1] | + | $tpaths = $t[1] |
| - | if ($tpath.Contains($pf)) | + | foreach ($tpath in $tpaths) |
| { | { | ||
| - | $path64 = $tpath.Replace($pf, $env:ProgramW6432) | + | if ($tpath.Contains($pf)) |
| - | # Only true as long as WinSCP is 32-bit | + | |
| - | $path32 = $tpath.Replace($pf, $env:ProgramFiles) | + | |
| - | if (Test-Path $path64) | + | |
| { | { | ||
| - | $path = $path64 | + | $path64 = $tpath.Replace($pf, $env:ProgramW6432) |
| + | $path32on64 = $tpath.Replace($pf, ${env:ProgramFiles(x86)}) | ||
| + | $path32 = $tpath.Replace($pf, $env:ProgramFiles) | ||
| + | if (Test-Path $path64) | ||
| + | { | ||
| + | ························$path = $path64 | ||
| + | break | ||
| + | } | ||
| + | elseif (Test-Path $path32on64) | ||
| + | { | ||
| + | $path = $path32on64 | ||
| + | break | ||
| + | } | ||
| + | elseif (Test-Path $path32) | ||
| + | { | ||
| + | $path = $path32 | ||
| + | break | ||
| + | } | ||
| } | } | ||
| - | elseif (Test-Path $path32) | + | else |
| { | { | ||
| - | $path = $path32 | + | $path = $tpath |
| + | break | ||
| } | } | ||
| - | } | ||
| - | else | ||
| - | { | ||
| - | $path = $tpath | ||
| } | } | ||