images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-08-03 05:49:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-2

Browse Source 
# Conflicts:
#	vendor/profile.ps1
This commit is contained in:
刘祺
2017-08-03 18:32:44 +08:00
parent a7237370e3 a34e17f2bd
commit 7ca2f5503a
8 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/profile.ps1 vendored
View File

@ -21,10 +21,14 @@ if (! $ENV:CMDER_ROOT ) {
# Remove trailing '\'
$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
# do not load bundled psget if a module installer is already available
# -> recent PowerShell versions include PowerShellGet out of the box
$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue | Out-Null)
# Add Cmder modules directory to the autoload path.
$CmderModulePath = Join-path $PSScriptRoot "psmodules/"
if( -not $env:PSModulePath.Contains($CmderModulePath) ){
if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ){
$env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
}