mirror of
				https://github.com/cmderdev/cmder.git
				synced 2025-10-31 09:22:15 +08:00 
			
		
		
		
	synced with upstream/development
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -14,3 +14,4 @@ Version v* | ||||
| *.bak | ||||
| config/user-* | ||||
| config/aliases | ||||
| config/profile.d | ||||
|   | ||||
							
								
								
									
										2
									
								
								vendor/cmder.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/cmder.sh
									
									
									
									
										vendored
									
									
								
							| @@ -44,7 +44,7 @@ fi | ||||
| if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then | ||||
|   unset profile_d_scripts | ||||
|   pushd ${CMDER_ROOT}/config/profile.d >/dev/null | ||||
|   profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh) 2>/dev/null | ||||
|   profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null) | ||||
|  | ||||
|   if [ ! "x${profile_d_scripts}" = "x" ] ; then | ||||
|     for x in ${profile_d_scripts} ; do | ||||
|   | ||||
							
								
								
									
										4
									
								
								vendor/cmder_exinit
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/cmder_exinit
									
									
									
									
										vendored
									
									
								
							| @@ -58,9 +58,9 @@ if [ ! "$CMDER_ROOT" = "" ] ; then | ||||
|     unset profile_d_scripts | ||||
|     pushd ${CMDER_ROOT}/config/profile.d >/dev/null | ||||
|     if [ ! "x${ZSH_VERSION}" = "x"  ]; then | ||||
|       profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh) 2>/dev/null | ||||
|       profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh 2>/dev/null) | ||||
|     elif [ ! "x${BASH_VERSION}" = "x"  ]; then | ||||
|       profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh) 2>/dev/null | ||||
|       profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null) | ||||
|     fi | ||||
|    | ||||
|     if [ ! "x${profile_d_scripts}" = "x" ] ; then | ||||
|   | ||||
							
								
								
									
										73
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										73
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							| @@ -1,3 +1,5 @@ | ||||
| @echo off | ||||
|  | ||||
| :: Init Script for cmd.exe | ||||
| :: Created as part of cmder project | ||||
|  | ||||
| @@ -5,41 +7,41 @@ | ||||
| :: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands | ||||
|  | ||||
| :: Find root dir | ||||
| @if not defined CMDER_ROOT ( | ||||
|     for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi | ||||
| if not defined CMDER_ROOT ( | ||||
|     for /f "delims=" %%i in ("%ConEmuDir%\..\..") do set CMDER_ROOT=%%~fi | ||||
| ) | ||||
|  | ||||
| :: Remove trailing '\' | ||||
| @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% | ||||
| if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% | ||||
|  | ||||
| :: Change the prompt style | ||||
| :: Mmm tasty lamb | ||||
| @prompt $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m | ||||
| prompt $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m | ||||
|  | ||||
| :: Pick right version of clink | ||||
| @if "%PROCESSOR_ARCHITECTURE%"=="x86" ( | ||||
| if "%PROCESSOR_ARCHITECTURE%"=="x86" ( | ||||
|     set architecture=86 | ||||
| ) else ( | ||||
|     set architecture=64 | ||||
| ) | ||||
|  | ||||
| :: Tell the user about the clink config files... | ||||
| @if not exist "%CMDER_ROOT%\config\settings" ( | ||||
| if not exist "%CMDER_ROOT%\config\settings" ( | ||||
|     echo Generating clink initial settings in %CMDER_ROOT%\config\settings | ||||
|     echo Additional *.lua files in %CMDER_ROOT%\config are loaded on startup. | ||||
| )  | ||||
|  | ||||
| :: Run clink | ||||
| @"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" | ||||
| "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" | ||||
|  | ||||
| :: Prepare for git-for-windows | ||||
|  | ||||
| :: I do not even know, copypasted from their .bat | ||||
| @set PLINK_PROTOCOL=ssh | ||||
| @if not defined TERM set TERM=cygwin | ||||
| set PLINK_PROTOCOL=ssh | ||||
| if not defined TERM set TERM=cygwin | ||||
|  | ||||
| :: Check if msysgit is installed | ||||
| @if exist "%ProgramFiles%\Git" ( | ||||
| if exist "%ProgramFiles%\Git" ( | ||||
|     set "GIT_INSTALL_ROOT=%ProgramFiles%\Git" | ||||
| ) else if exist "%ProgramFiles(x86)%\Git" ( | ||||
|     set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git" | ||||
| @@ -50,35 +52,35 @@ | ||||
| ) | ||||
|  | ||||
| :: Add git to the path | ||||
| @if defined GIT_INSTALL_ROOT ( | ||||
| if defined GIT_INSTALL_ROOT ( | ||||
|     set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74;%PATH%" | ||||
|     :: define SVN_SSH so we can use git svn with ssh svn repositories | ||||
|     if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe" | ||||
| ) | ||||
|  | ||||
| :: Enhance Path | ||||
| @set "PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\" | ||||
| set "PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\" | ||||
|  | ||||
| :: make sure we have an example file | ||||
| @set aliases=%CMDER_ROOT%\config\user-aliases.cmd | ||||
| @if not exist "%aliases%" ( | ||||
| set aliases=%CMDER_ROOT%\config\user-aliases.cmd | ||||
| if not exist "%aliases%" ( | ||||
|     echo Creating intial aliases in "%aliases%"... | ||||
|     copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%aliases%" | ||||
| ) | ||||
|  | ||||
| :: Update old 'aliases' to new self executing 'user-aliases.cmd' | ||||
| @if exist "%CMDER_ROOT%\config\aliases" ( | ||||
| if exist "%CMDER_ROOT%\config\aliases" ( | ||||
|   echo Updating old "%CMDER_ROOT%\config\aliases" to new format... | ||||
|   type "%CMDER_ROOT%\config\aliases" >> "%aliases%" && del "%CMDER_ROOT%\config\aliases" | ||||
| ) | ||||
|    | ||||
| :: Add aliases to the environment. | ||||
| @call "%aliases%" | ||||
| call "%aliases%" | ||||
|  | ||||
| :: See vendor\git-for-windows\README.portable for why we do this | ||||
| :: Basically we need to execute this post-install.bat because we are | ||||
| :: manually extracting the archive rather than executing the 7z sfx | ||||
| @if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" ( | ||||
| if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" ( | ||||
|     echo Running Git for Windows one time Post Install.... | ||||
|     cd /d "%CMDER_ROOT%\vendor\git-for-windows\" | ||||
|     "%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat | ||||
| @@ -86,39 +88,38 @@ | ||||
| ) | ||||
|  | ||||
| :: Set home path | ||||
| @if not defined HOME set HOME=%USERPROFILE% | ||||
| if not defined HOME set HOME=%USERPROFILE% | ||||
|  | ||||
| :: This is either a env variable set by the user or the result of | ||||
| :: cmder.exe setting this variable due to a commandline argument or a "cmder here" | ||||
| @if defined CMDER_START ( | ||||
|     @cd /d "%CMDER_START%" | ||||
| if defined CMDER_START ( | ||||
|     cd /d "%CMDER_START%" | ||||
| ) | ||||
|  | ||||
| :: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d" | ||||
| :: to run them at startup. | ||||
|  | ||||
| @if not exist "%CMDER_ROOT%\config\profile.d" ( | ||||
| if not exist "%CMDER_ROOT%\config\profile.d" ( | ||||
|   mkdir "%CMDER_ROOT%\config\profile.d" | ||||
| ) | ||||
|  | ||||
| @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 | ||||
| pushd "%CMDER_ROOT%\config\profile.d" | ||||
| 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 | ||||
| popd | ||||
|  | ||||
| @if exist "%CMDER_ROOT%\config\user-profile.cmd" ( | ||||
|     @rem create this file and place your own command in there | ||||
| if exist "%CMDER_ROOT%\config\user-profile.cmd" ( | ||||
|     rem create this file and place your own command in there | ||||
|     call "%CMDER_ROOT%\config\user-profile.cmd" | ||||
| ) else ( | ||||
|     @echo Creating user startup file: "%CMDER_ROOT%\config\user-profile.cmd" | ||||
|     echo Creating user startup file: "%CMDER_ROOT%\config\user-profile.cmd" | ||||
|     ( | ||||
|     @echo :: use this file to run your own startup commands | ||||
|     @echo :: use @ in front of the command to prevent printing the command | ||||
|     @echo. | ||||
|     @echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd | ||||
|     @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% | ||||
|     @echo. | ||||
|     echo :: use this file to run your own startup commands | ||||
|     echo :: use  in front of the command to prevent printing the command | ||||
|     echo. | ||||
|     echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd | ||||
|     echo :: set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% | ||||
|     echo. | ||||
|     ) > "%CMDER_ROOT%\config\user-profile.cmd" | ||||
| ) | ||||
|   | ||||
							
								
								
									
										3
									
								
								vendor/profile.ps1
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/profile.ps1
									
									
									
									
										vendored
									
									
								
							| @@ -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) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user