images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-14 07:29:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

synced with upstream/development

Browse Source
This commit is contained in:
Dax T. Games 2016-03-06 17:18:51 -06:00
commit 3085fca9e0
5 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ Version v*
*.bak *.bak
config/user-* config/user-*
config/aliases config/aliases
config/profile.d

2
vendor/cmder.sh vendored
View File

@ -44,7 +44,7 @@ fi
if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
unset profile_d_scripts unset profile_d_scripts
pushd ${CMDER_ROOT}/config/profile.d >/dev/null 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 if [ ! "x${profile_d_scripts}" = "x" ] ; then
for x in ${profile_d_scripts} ; do for x in ${profile_d_scripts} ; do

4
vendor/cmder_exinit vendored
View File

@ -58,9 +58,9 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
unset profile_d_scripts unset profile_d_scripts
pushd ${CMDER_ROOT}/config/profile.d >/dev/null pushd ${CMDER_ROOT}/config/profile.d >/dev/null
if [ ! "x${ZSH_VERSION}" = "x" ]; then 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 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 fi
if [ ! "x${profile_d_scripts}" = "x" ] ; then if [ ! "x${profile_d_scripts}" = "x" ] ; then

73
vendor/init.bat vendored
View File

@ -1,3 +1,5 @@
@echo off
:: Init Script for cmd.exe :: Init Script for cmd.exe
:: Created as part of cmder project :: Created as part of cmder project
@ -5,41 +7,41 @@
:: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands :: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands
:: Find root dir :: Find root dir
@if not defined CMDER_ROOT ( if not defined CMDER_ROOT (
for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi for /f "delims=" %%i in ("%ConEmuDir%\..\..") do set CMDER_ROOT=%%~fi
) )
:: Remove trailing '\' :: 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 :: Change the prompt style
:: Mmm tasty lamb :: 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 :: Pick right version of clink
@if "%PROCESSOR_ARCHITECTURE%"=="x86" ( if "%PROCESSOR_ARCHITECTURE%"=="x86" (
set architecture=86 set architecture=86
) else ( ) else (
set architecture=64 set architecture=64
) )
:: Tell the user about the clink config files... :: 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 Generating clink initial settings in %CMDER_ROOT%\config\settings
echo Additional *.lua files in %CMDER_ROOT%\config are loaded on startup. echo Additional *.lua files in %CMDER_ROOT%\config are loaded on startup.
) )
:: Run clink :: 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 :: Prepare for git-for-windows
:: I do not even know, copypasted from their .bat :: I do not even know, copypasted from their .bat
@set PLINK_PROTOCOL=ssh set PLINK_PROTOCOL=ssh
@if not defined TERM set TERM=cygwin if not defined TERM set TERM=cygwin
:: Check if msysgit is installed :: Check if msysgit is installed
@if exist "%ProgramFiles%\Git" ( if exist "%ProgramFiles%\Git" (
set "GIT_INSTALL_ROOT=%ProgramFiles%\Git" set "GIT_INSTALL_ROOT=%ProgramFiles%\Git"
) else if exist "%ProgramFiles(x86)%\Git" ( ) else if exist "%ProgramFiles(x86)%\Git" (
set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git" set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git"
@ -50,35 +52,35 @@
) )
:: Add git to the path :: 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%" 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 :: 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" if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
) )
:: Enhance Path :: 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 :: make sure we have an example file
@set aliases=%CMDER_ROOT%\config\user-aliases.cmd set aliases=%CMDER_ROOT%\config\user-aliases.cmd
@if not exist "%aliases%" ( if not exist "%aliases%" (
echo Creating intial aliases in "%aliases%"... echo Creating intial aliases in "%aliases%"...
copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%aliases%" copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%aliases%"
) )
:: Update old 'aliases' to new self executing 'user-aliases.cmd' :: 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... echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
type "%CMDER_ROOT%\config\aliases" >> "%aliases%" && del "%CMDER_ROOT%\config\aliases" type "%CMDER_ROOT%\config\aliases" >> "%aliases%" && del "%CMDER_ROOT%\config\aliases"
) )
:: Add aliases to the environment. :: Add aliases to the environment.
@call "%aliases%" call "%aliases%"
:: See vendor\git-for-windows\README.portable for why we do this :: See vendor\git-for-windows\README.portable for why we do this
:: Basically we need to execute this post-install.bat because we are :: Basically we need to execute this post-install.bat because we are
:: manually extracting the archive rather than executing the 7z sfx :: 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.... echo Running Git for Windows one time Post Install....
cd /d "%CMDER_ROOT%\vendor\git-for-windows\" 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 "%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 :: 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 :: 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" :: cmder.exe setting this variable due to a commandline argument or a "cmder here"
@if defined CMDER_START ( if defined CMDER_START (
@cd /d "%CMDER_START%" cd /d "%CMDER_START%"
) )
:: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d" :: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d"
:: to run them at startup. :: 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" mkdir "%CMDER_ROOT%\config\profile.d"
) )
@pushd "%CMDER_ROOT%\config\profile.d" pushd "%CMDER_ROOT%\config\profile.d"
for /f "usebackq" %%x in ( `dir /b *.bat *.cmd` ) do ( for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
REM @echo Calling %CMDER_ROOT%\config\profile.d\%%x... REM echo Calling %CMDER_ROOT%\config\profile.d\%%x...
@call %%x call "%CMDER_ROOT%\config\profile.d\%%x"
) )
@popd popd
@if exist "%CMDER_ROOT%\config\user-profile.cmd" ( if exist "%CMDER_ROOT%\config\user-profile.cmd" (
@rem create this file and place your own command in there rem create this file and place your own command in there
call "%CMDER_ROOT%\config\user-profile.cmd" call "%CMDER_ROOT%\config\user-profile.cmd"
) else ( ) 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 this file to run your own startup commands
@echo :: use @ in front of the command to prevent printing the command echo :: use in front of the command to prevent printing the command
@echo. echo.
@echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd
@echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% echo :: set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%
@echo. echo.
) > "%CMDER_ROOT%\config\user-profile.cmd" ) > "%CMDER_ROOT%\config\user-profile.cmd"
) )

3
vendor/profile.ps1 vendored
View File

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