mirror of
https://github.com/cmderdev/cmder.git
synced 2024-11-10 17:59:11 +08:00
Merge pull request #867 from daxgames/cmd_profile.d_fix
Various fixes for profile.d support
This commit is contained in:
commit
df768f3c5e
6
vendor/init.bat
vendored
6
vendor/init.bat
vendored
@ -95,9 +95,9 @@
|
|||||||
)
|
)
|
||||||
|
|
||||||
@pushd "%CMDER_ROOT%\config\profile.d"
|
@pushd "%CMDER_ROOT%\config\profile.d"
|
||||||
for /f "usebackq" %%x in ( `dir /b *.bat *.cmd` ) do (
|
@for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do @(
|
||||||
REM @echo Calling %CMDER_ROOT%\config\profile.d\%%x...
|
@REM echo Calling %CMDER_ROOT%\config\profile.d\%%x...
|
||||||
@call %%x
|
@call "%CMDER_ROOT%\config\profile.d\%%x"
|
||||||
)
|
)
|
||||||
@popd
|
@popd
|
||||||
|
|
||||||
|
3
vendor/profile.ps1
vendored
3
vendor/profile.ps1
vendored
@ -99,9 +99,10 @@ if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
|
|||||||
|
|
||||||
pushd $ENV:CMDER_ROOT\config\profile.d
|
pushd $ENV:CMDER_ROOT\config\profile.d
|
||||||
foreach ($x in ls *.ps1) {
|
foreach ($x in ls *.ps1) {
|
||||||
# write-host Sourcing $ENV:CMDER_ROOT\config\profile.d\$x
|
# write-host write-host Sourcing $x
|
||||||
. $x
|
. $x
|
||||||
}
|
}
|
||||||
|
popd
|
||||||
|
|
||||||
$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
|
$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
|
||||||
if(Test-Path $CmderUserProfilePath) {
|
if(Test-Path $CmderUserProfilePath) {
|
||||||
|
Loading…
Reference in New Issue
Block a user