mirror of
https://github.com/cmderdev/cmder.git
synced 2025-01-11 00:39:08 +08:00
Removed training '\' from %CMDER_ROOT% and added config/user-* to .gitignore
This commit is contained in:
parent
ffd61db30e
commit
eb5ab51573
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ Thumbs.db
|
|||||||
build/
|
build/
|
||||||
Version v*
|
Version v*
|
||||||
*.bak
|
*.bak
|
||||||
|
config/user-*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
@echo off
|
@echo off
|
||||||
SET CMDER_ROOT=%~dp0
|
SET CMDER_ROOT=%~dp0
|
||||||
|
if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
|
||||||
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
|
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
|
||||||
|
8
vendor/init.bat
vendored
8
vendor/init.bat
vendored
@ -9,6 +9,8 @@
|
|||||||
for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi
|
for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@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
|
||||||
@ -34,7 +36,7 @@
|
|||||||
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"
|
||||||
) else if exist "%CMDER_ROOT%\vendor" (
|
) else if exist "%CMDER_ROOT%\vendor\git-for-windows" (
|
||||||
set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
|
set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -46,7 +48,7 @@
|
|||||||
)
|
)
|
||||||
|
|
||||||
:: Enhance Path
|
:: Enhance Path
|
||||||
@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%
|
@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\
|
||||||
|
|
||||||
:: Add aliases
|
:: Add aliases
|
||||||
@doskey /macrofile="%CMDER_ROOT%\config\aliases"
|
@doskey /macrofile="%CMDER_ROOT%\config\aliases"
|
||||||
@ -57,7 +59,7 @@
|
|||||||
@if defined CMDER_START (
|
@if defined CMDER_START (
|
||||||
@cd /d "%CMDER_START%"
|
@cd /d "%CMDER_START%"
|
||||||
) else (
|
) else (
|
||||||
@if "%CD%\" == "%CMDER_ROOT%" (
|
@if "%CD%\" == "%CMDER_ROOT%\" (
|
||||||
@cd /d "%HOME%"
|
@cd /d "%HOME%"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user