From ddc55d70a7a847e00314670c8098dbbca3b8763e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 16 Jul 2023 13:12:50 +0800 Subject: [PATCH] Terminal (Linux): don't assume conhost in WSL --- src/detection/terminalshell/terminalshell_linux.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 770df3c09..a6777f570 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -208,6 +208,11 @@ static void getTerminalFromEnv(FFTerminalShellResult* result) getenv("WT_SESSION") != NULL || getenv("WT_PROFILE_ID") != NULL )) term = "Windows Terminal"; + + //ConEmu + if(!ffStrSet(term) && ( + getenv("ConEmuPID") != NULL + )) term = "ConEmu"; #endif //Alacritty @@ -237,15 +242,6 @@ static void getTerminalFromEnv(FFTerminalShellResult* result) if(!ffStrSet(term)) term = getenv("TERM_PROGRAM"); - #ifdef __linux__ - if(!ffStrSet(term)) - { - //We are in WSL but not in Windows Terminal - if(getenv("WSL_DISTRO") != NULL || getenv("WSL_INTEROP") != NULL) - term = "conhost"; - } - #endif - //Normal Terminal if(!ffStrSet(term)) term = getenv("TERM");