2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

ConEmu sections updated

Browse source 
* Use a ConEmu variable instead of manually setting IN_CONEMU=True
* USE_CONEMU renamed RELOAD_IN_CONEMU for clarity
This commit is contained in:
Alan Mason 2017-11-22 13:51:13 -08:00
parent 2b7e3f38fe
commit ec97e4deb3
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.bin/Scripts/Launch.cmd
View file

@ -66,17 +66,16 @@ if /i not "%L_NCMD%" == "True" (set "L_NCMD=")
if /i not "%L_WAIT%" == "True" (set "L_WAIT=") if /i not "%L_WAIT%" == "True" (set "L_WAIT=")
:RelaunchInConEmu :RelaunchInConEmu
set USE_CONEMU=True set RELOAD_IN_CONEMU=True
if defined IN_CONEMU set "USE_CONEMU=" if defined ConEmuBuild set "RELOAD_IN_CONEMU="
if defined L_NCMD set "USE_CONEMU=" if defined L_NCMD set "RELOAD_IN_CONEMU="
if "%L_TYPE%" == "PSScript" set "USE_CONEMU=" if "%L_TYPE%" == "PSScript" set "RELOAD_IN_CONEMU="
if "%L_TYPE%" == "PyScript" set "USE_CONEMU=" if "%L_TYPE%" == "PyScript" set "RELOAD_IN_CONEMU="
if defined USE_CONEMU ( if defined RELOAD_IN_CONEMU (
set "con_args=-new_console:n" set "con_args=-new_console:n"
rem If in DEBUG state then force ConEmu to stay open rem If in DEBUG state then force ConEmu to stay open
if defined DEBUG (set "con_args=!con_args! -new_console:c") if defined DEBUG (set "con_args=!con_args! -new_console:c")
set IN_CONEMU=True
start "" "%CON%" -run ""%~0" %*" !con_args! || goto ErrorUnknown start "" "%CON%" -run ""%~0" %*" !con_args! || goto ErrorUnknown
exit /b 0 exit /b 0
) )
@ -424,7 +423,7 @@ echo. DEBUG: %DEBUG%
echo. PYTHON: %PYTHON% echo. PYTHON: %PYTHON%
rem Pause script only if we want to catch the error AND only when using ConEmu rem Pause script only if we want to catch the error AND only when using ConEmu
if defined L_CHCK ( if defined L_CHCK (
if not defined L_NCMD ( if defined ConEmuBuild (
echo Press any key to exit... echo Press any key to exit...
pause>nul pause>nul
) )