Merge branch 'master' into dev

Conflicts:
	vendor/init.bat
This commit is contained in:
kjerk
2013-12-09 03:23:27 -08:00
14 changed files with 575 additions and 26 deletions

28
vendor/init.bat vendored
View File

@ -2,16 +2,9 @@
:: Sets some nice defaults
:: Created as part of cmder project
:: Setting prompt style
@for /f "tokens=2 delims=:." %%x in ('chcp') do @set cp=%%x
:: The slow part
:: World without Unicode is a sad world
@chcp 65001>nul
:: It has to be lambda, I already made a logo
@prompt $E[1;32;40m$P$S{git}$S$_$E[1;30;40mλ$S$E[0m
@chcp %cp%>nul
:: Change the prompt style
:: Mmm tasty lamb
@prompt $E[1;32;40m$P$S{git}$S$_$E[1;30;40m{lamb}$S$E[0m
:: Pick right version of clink
@if "%PROCESSOR_ARCHITECTURE%"=="x86" (
@ -20,24 +13,23 @@
set architecture=64
)
@set rootDir="%~dp0\.."
:: Run clink
@%rootDir%\vendor\clink\clink_x%architecture%.exe inject --quiet --profile %rootDir%\config
@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
:: Prepare for msysgit
:: I do not even know, copypasted from their .bat
@set PLINK_PROTOCOL=ssh
@if not defined TERM set TERM=msys
@if not defined TERM set TERM=cygwin
:: Enhance Path
@set git_install_root=%rootDir%\vendor\msysgit
@set PATH=%PATH%;%rootDir%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;
@set git_install_root=%CMDER_ROOT%\vendor\msysgit
@set PATH=%PATH%;%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;
:: Add aliases
@doskey /macrofile=%rootDir%\config\aliases
@doskey /macrofile=%CMDER_ROOT%\config\aliases
:: Set home path
@set HOME=%USERPROFILE%
@echo Welcome to cmder!
@if defined CMDER_START cd /d "%CMDER_START%"