images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-11-09 13:49:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

adjust comments

Browse Source
This commit is contained in:
David Refoua
2025-11-09 02:48:02 +03:30
committed by GitHub
parent fc24040e5e
commit 697c122faf
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/psmodules/Cmder.ps1 vendored
View File

@@ -151,17 +151,12 @@ function Set-GitPath {
$newPath = "$gitCmd;$newPath" $newPath = "$gitCmd;$newPath"
} }
<<<<<<< HEAD
# Add mingw[32|64]\bin directories to the path, if they exist and not already present # Add mingw[32|64]\bin directories to the path, if they exist and not already present
foreach ($mingw in @('mingw64', 'mingw32')) {
=======
# Add mingw bin directory
# Prefer mingw64 on 64-bit systems, mingw32 on 32-bit systems # Prefer mingw64 on 64-bit systems, mingw32 on 32-bit systems
$is64Bit = [Environment]::Is64BitOperatingSystem $is64Bit = [Environment]::Is64BitOperatingSystem
$mingwDirs = if ($is64Bit) { @('mingw64', 'mingw32') } else { @('mingw32') } $mingwDirs = if ($is64Bit) { @('mingw64', 'mingw32') } else { @('mingw32') }
foreach ($mingw in $mingwDirs) { foreach ($mingw in $mingwDirs) {
>>>>>>> a1def7195e8050d0f964f292d51c695e0e07dbef
$mingwBin = Join-Path $GitRoot "$mingw\bin" $mingwBin = Join-Path $GitRoot "$mingw\bin"
if ((Test-Path $mingwBin) -and -not ($newPath -match [regex]::Escape($mingwBin))) { if ((Test-Path $mingwBin) -and -not ($newPath -match [regex]::Escape($mingwBin))) {
Write-Debug "Adding $mingwBin to the path" Write-Debug "Adding $mingwBin to the path"