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

Merge branch 'master' into development

Browse Source
This commit is contained in:
DRSDavidSoft
2025-11-09 01:06:50 +00:00
parent 7bb7678521 7f0cfac498
commit 480b638e0e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/tests.yml vendored
View File

@@ -48,8 +48,7 @@ jobs:
cmd /c vendor\init.bat /v /d /t
- name: Testing PowerShell
run: |
PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$CMDER_DEBUG = 1; 'vendor\profile.ps1' 4>&1 5>&1"
PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . 'vendor\profile.ps1'" 4>&1 5>&1
PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . 'vendor\profile.ps1'"
- name: Testing Bash
run: |
bash vendor/cmder.sh

9
vendor/profile.ps1 vendored
View File

@@ -45,7 +45,7 @@ if (-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderMo
$env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
}
if ($ENV:CMDER_USER_CONFIG) {
if ($env:CMDER_USER_CONFIG) {
Write-Verbose "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
}
@@ -71,11 +71,14 @@ foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
# Use user installed Git
if ($null -eq $gitPathUser) {
Write-Debug "Detected Git from mingw bin directory"
Write-Debug "Git Dir: ${gitDir}"
if ($gitDir -match '\\mingw32\\bin' -or $gitDir -match '\\mingw64\\bin') {
$gitPathUser = ($gitDir.subString(0,$gitDir.Length - 12))
$gitPathUser = $gitDir.subString(0, $gitDir.Length - 12)
} else {
$gitPathUser = ($gitDir.subString(0,$gitDir.Length - 4))
$gitPathUser = $gitDir.subString(0, $gitDir.Length - 4)
}
Write-Debug "Git Path User: ${gitDir}"
}
if ($useGitVersion -eq $gitVersionUser) {