Merge pull request #2745 from DRSDavidSoft/patch-3

Minimal comspec detection (related to #2744)
cmderdev · Sep 9, 2022 · dab1dd9 · dab1dd9
2 parents 5c409da + e2d817a
commit dab1dd9
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/vendor/lib/lib_base.cmd b/vendor/lib/lib_base.cmd
@@ -61,22 +61,21 @@ exit /b
 :::       file <in> full path to file containing lib_routines to display
 :::.
 :::-------------------------------------------------------------------------------
-    echo %comspec% | %WINDIR%\System32\find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd"
-    echo %comspec% | %WINDIR%\System32\find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc"
-    echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
-
+    call :detect_comspec %ComSpec%
+    exit /b
+
+:detect_comspec
+    set CMDER_SHELL=%~n1
     if not defined CMDER_CLINK (
         set CMDER_CLINK=1
         if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
         if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0
     )
-
     if not defined CMDER_ALIASES (
         set CMDER_ALIASES=1
         if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0
         if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0
     )
-
     exit /b
 
 :update_legacy_aliases