Merge pull request #867 from daxgames/cmd_profile.d_fix

Various fixes for profile.d support
cmderdev · Mar 5, 2016 · df768f3 · df768f3
2 parents a74fdd2 + 8dbbb90
commit df768f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/vendor/init.bat b/vendor/init.bat
@@ -95,9 +95,9 @@
 )
 
 @pushd "%CMDER_ROOT%\config\profile.d"
-for /f "usebackq" %%x in ( `dir /b *.bat *.cmd` ) do (
-  REM @echo Calling %CMDER_ROOT%\config\profile.d\%%x...
-  @call %%x
+@for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do @(
+  @REM echo Calling %CMDER_ROOT%\config\profile.d\%%x...
+  @call "%CMDER_ROOT%\config\profile.d\%%x"
 )
 @popd
 

diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
@@ -99,9 +99,10 @@ if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
 
 pushd $ENV:CMDER_ROOT\config\profile.d
 foreach ($x in ls *.ps1) {
-  # write-host Sourcing $ENV:CMDER_ROOT\config\profile.d\$x
+  # write-host write-host Sourcing $x
   . $x
 }
+popd
 
 $CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
 if(Test-Path $CmderUserProfilePath) {