Merge pull request #273 from LeoColomb/master

Fixes small Powershell' loader issues
cmderdev · Mar 18, 2015 · 021263d · 021263d
2 parents 5dbb84d + dc834cc
commit 021263d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 92 deletions.
diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
@@ -5,8 +5,8 @@ $global:PsGetDestinationModulePath = $PSScriptRoot + "\..\vendor\psmodules"
 Push-Location -Path ($PsGetDestinationModulePath)
 
 # Load modules from current directory
-Get-ChildItem -Directory | `
-Foreach-Object{
+Import-Module .\PsGet\PsGet
+Get-ChildItem -Exclude "PsGet" -Directory -Name | Foreach-Object {
     Import-Module .\$_\$_
 }
 
@@ -16,8 +16,8 @@ Pop-Location
 # Set up a Cmder prompt, adding the git prompt parts inside git repos
 function global:prompt {
     $realLASTEXITCODE = $LASTEXITCODE
-    $Host.UI.RawUI.ForegroundColor = "white"
-    Write-Host($pwd.ProviderPath) -NoNewLine -ForegroundColor "green"
+    $Host.UI.RawUI.ForegroundColor = "White"
+    Write-Host("`n" + $pwd.ProviderPath) -NoNewLine -ForegroundColor Green
     if (Get-Module posh-git) {
         Write-VcsStatus
     }

diff --git a/vendor/psmodules/PsGet/PsGet.psd1 b/vendor/psmodules/PsGet/PsGet.psd1