mirror of
				https://github.com/cmderdev/cmder.git
				synced 2025-10-31 17:32:27 +08:00 
			
		
		
		
	Merge branch 'ps1_prompt' of https://github.com/daxgames/cmder into ps1_prompt
This commit is contained in:
		
							
								
								
									
										4
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							| @@ -51,9 +51,7 @@ call "%cmder_root%\vendor\lib\lib_profile" | ||||
|     ) else if /i "%1"=="/v" ( | ||||
|         set verbose_output=1 | ||||
|     ) else if /i "%1"=="/d" ( | ||||
|         if not defined VSCODE_CWD ( | ||||
|             set debug_output=1 | ||||
|         ) | ||||
|         set debug_output=1 | ||||
|     ) else if /i "%1" == "/max_depth" ( | ||||
|         if "%~2" geq "1" if "%~2" leq "5" ( | ||||
|             set "max_depth=%~2" | ||||
|   | ||||
							
								
								
									
										12
									
								
								vendor/profile.ps1
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								vendor/profile.ps1
									
									
									
									
										vendored
									
									
								
							| @@ -25,7 +25,7 @@ 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 | ||||
| # 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) | ||||
|  | ||||
| @@ -99,11 +99,6 @@ if (Get-Module PSReadline -ErrorAction "SilentlyContinue") { | ||||
| # Enhance Path | ||||
| $env:Path = "$Env:CMDER_ROOT\bin;$Env:CMDER_ROOT\vendor\bin;$env:Path;$Env:CMDER_ROOT" | ||||
|  | ||||
| # | ||||
| # Prompt Section | ||||
| #   Users should modify their user_profile.ps1 as it will be safe from updates. | ||||
| # | ||||
|  | ||||
| # Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d" | ||||
| # to source them at startup. | ||||
| if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) { | ||||
| @@ -168,6 +163,11 @@ if (! (Test-Path $CmderUserProfilePath) ) { | ||||
|     Copy-Item "$env:CMDER_ROOT\vendor\user_profile.ps1.default" -Destination $CmderUserProfilePath | ||||
| } | ||||
|  | ||||
| # | ||||
| # Prompt Section | ||||
| #   Users should modify their user_profile.ps1 as it will be safe from updates. | ||||
| # | ||||
|  | ||||
| # Only set the prompt if it is currently set to the default | ||||
| # This allows users to configure the prompt in their user_profile.ps1 or config\profile.d\*.ps1 | ||||
| if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionState.Path.CurrentLocation\)\$\(' -and ` | ||||
|   | ||||
		Reference in New Issue
	
	Block a user