fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix detecting Windows Terminal on WSL2 and SSH env

Browse Source
This commit is contained in:
李通洲
2021-10-17 01:05:45 +08:00
parent d288a698b0
commit 7dc70b9730
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/detectTerminalShell.c
+15 -4
View File
@@ -72,6 +72,7 @@ static void getTerminalShell(FFTerminalShellResult* result, const char* pid)
strcasecmp(name, "su") == 0 ||
strcasecmp(name, "doas") == 0 ||
strcasecmp(name, "strace") == 0 ||
strcasecmp(name, "sshd") == 0 ||
strcasecmp(name, "gdb") == 0
) {
getTerminalShell(result, ppid);
@@ -111,15 +112,25 @@ static void getTerminalFromEnv(FFTerminalShellResult* result)
ffStrbufIgnCaseCompS(&result->terminalProcessName, "0") != 0
) return;
char* term = getenv("TERM");
char* term = NULL;
//SSH
if(getenv("SSH_CONNECTION") != NULL)
term = getenv("SSH_TTY");
//Windows Terminal
if((term == NULL || *term == '\0') && getenv("WT_SESSION") != NULL)
term = "Windows Terminal";
//Normal Terminal
if(term == NULL || *term == '\0')
term = getenv("TERM");
//TTY
if(term == NULL || *term == '\0' || strcasecmp(term, "linux") == 0)
term = ttyname(STDIN_FILENO);
if(result->terminalProcessName.length == 0)
ffStrbufAppendS(&result->terminalProcessName, term);
ffStrbufSetS(&result->terminalProcessName, term);
ffStrbufSetS(&result->terminalExe, term);
setExeName(&result->terminalExe, &result->terminalExeName);
}