minimal comspec detection (fixes #2744)

This commit is contained in:
David Refoua 2022-09-09 17:24:25 +04:30 committed by GitHub
parent 5c409dabc8
commit d1b1012741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -61,22 +61,21 @@ exit /b
::: file <in> full path to file containing lib_routines to display ::: file <in> full path to file containing lib_routines to display
:::. :::.
:::------------------------------------------------------------------------------- :::-------------------------------------------------------------------------------
echo %comspec% | %WINDIR%\System32\find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd" call :detect_comspec %ComSpec%
echo %comspec% | %WINDIR%\System32\find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc" exit /b
echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
:detect_comspec
CMDER_SHELL=%~n1
if not defined CMDER_CLINK ( if not defined CMDER_CLINK (
set CMDER_CLINK=1 set CMDER_CLINK=1
if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0 if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0 if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0
) )
if not defined CMDER_ALIASES ( if not defined CMDER_ALIASES (
set CMDER_ALIASES=1 set CMDER_ALIASES=1
if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0 if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0
if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0 if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0
) )
exit /b exit /b
:update_legacy_aliases :update_legacy_aliases