Merge pull request #867 from daxgames/cmd_profile.d_fix

Various fixes for profile.d support
This commit is contained in:
Benjamin Staneck 2016-03-05 02:21:46 +01:00
commit df768f3c5e
2 changed files with 5 additions and 4 deletions

6
vendor/init.bat vendored
View File

@ -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
View File

@ -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) {