Skip to content

Commit

Permalink
Update init.bat
Browse files Browse the repository at this point in the history 
If CMDER_CONFIGURED==1 skip to :CMDER_CONFIGURED
  • Loading branch information
@daxgames
daxgames authored Jun 9, 2020
1 parent 31c019b commit 8781779
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions vendor/init.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ call "%cmder_root%\vendor\lib\lib_console"
call "%cmder_root%\vendor\lib\lib_git"
call "%cmder_root%\vendor\lib\lib_profile"

:: if "%CMDER_CONFIGURED%" == "1" (
:: echo Cmder is already configured, skipping to user config!
::
:: goto USER_CONFIG_START
:: )

:var_loop
if "%~1" == "" (
goto :start
Expand Down Expand Up @@ -173,9 +167,9 @@ if "%CMDER_CLINK%" == "1" (
)

if "%CMDER_CONFIGURED%" == "1" (
echo Cmder is already configured, skipping to user config!
echo Cmder is already configured, skipping Cmder Init!

goto USER_CONFIG_START
goto CMDER_CONFIGURED

This comment has been minimized.

Sign in to view

Copy link
@UnderCooled

UnderCooled Jun 29, 2020

ConEmu's Split (GuiMacro Duplicate active "shell" split to right/bottom) will using CMDER_CONFIGURED=1 when spawn the new splitted task, USER_CONFIG_START session would be skipped, leading spawned task without user defined aliases/profile. Revert this modification will fix the issue.
)

:: Prepare for git-for-windows
Expand Down Expand Up @@ -393,6 +387,8 @@ if "%CMDER_ALIASES%" == "1" if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMD
)

set initialConfig=

:CMDER_CONFIGURED
set CMDER_CONFIGURED=1

set CMDER_INIT_END=%time%
Expand Down

0 comments on commit 8781779

Please sign in to comment.