From 8682492498b3c9ce5d0f48b8cad1f191f2f8426a Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:33:51 +0200 Subject: [PATCH 1/6] add tidalshell detection to /src/detection/terminalshell/terminalshell_windows.c --- src/detection/terminalshell/terminalshell_windows.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index d037663c83..d7bc9c0547 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -95,6 +95,8 @@ static void setShellInfoDetails(FFShellResult* result) { ffStrbufSetS(&result->prettyName, "Windows Explorer"); } else if (ffStrbufIgnCaseEqualS(&result->prettyName, "busybox")) { ffStrbufInitStatic(&result->prettyName, "ash"); + } else if (ffStrbufIgnCaseEqualS(&result->prettyName, "tidalshell")) { + ffStrbufSetS(&result->prettyName, "TidalShell"); } } From 21989cf5e68e749dec5a6eae970674596f195583 Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:38:16 +0200 Subject: [PATCH 2/6] add TidalShell detection to /src/detectin/terminalshell/terminalshell_linux.c --- src/detection/terminalshell/terminalshell_linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 1eccf26ebd..a01851538a 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -289,6 +289,8 @@ static void setShellInfoDetails(FFShellResult* result) { ffStrbufInitStatic(&result->prettyName, "Oils"); } else if (ffStrbufEqualS(&result->processName, "busybox")) { ffStrbufInitStatic(&result->prettyName, "ash"); + } else if (ffStrbufEqualS(&result->processName, "tidalshell")) { + ffStrbufInitStatic(&result->prettyName, "TidalShell"); } else { // https://github.com/fastfetch-cli/fastfetch/discussions/280#discussioncomment-3831734 ffStrbufInitS(&result->prettyName, result->exeName); From b257db1b327f5d550177213e8ab224f311e8ce49 Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:50:52 +0200 Subject: [PATCH 3/6] add tidalshell detection to terminalshell.c --- src/detection/terminalshell/terminalshell.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index b3c7d67108..ee5b24b9c0 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -240,6 +240,18 @@ static bool getShellVersionZsh(FFstrbuf* exe, FFstrbuf* version) { return getExeVersionGeneral(exe, version); // zsh 5.9 (arm-apple-darwin21.3.0) } +static bool getShellVersionTidalshell(FFstrbuf* exe, FFstrbuf* version) +{ + if (!ffProcessAppendStdOut(version, (char* const[]){ + exe->chars, + "-v", + NULL + })) return false; + ffStrbufTrimRightSpace(version); + ffStrbufSubstrBeforeFirstC(version, '-'); + return true; +} + #ifdef _WIN32 static bool getShellVersionWinPowerShell(FFstrbuf* exe, FFstrbuf* version) { const char* env = getenv("POWERSHELL_VERSION"); @@ -296,7 +308,9 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version) if (ffStrEqualsIgnCase(exeName, "brush")) { return getExeVersionGeneral(exe, version); // brush 0.2.23 (git:2835487) } - + if (ffStrEqualsIgnCase(exeName, "tidalshell")) { + return getShellVersionTidalshell(exe, version); // brush 0.2.23 (git:2835487) + } #ifdef _WIN32 if (ffStrEqualsIgnCase(exeName, "powershell") || ffStrEqualsIgnCase(exeName, "powershell_ise")) { return getShellVersionWinPowerShell(exe, version); From 41f72e0302d93249b8b6139e9683d71723d8bacd Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:53:50 +0200 Subject: [PATCH 4/6] fix inconsistency --- src/detection/terminalshell/terminalshell.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index ee5b24b9c0..0a2135a2fe 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -242,16 +242,14 @@ static bool getShellVersionZsh(FFstrbuf* exe, FFstrbuf* version) { static bool getShellVersionTidalshell(FFstrbuf* exe, FFstrbuf* version) { - if (!ffProcessAppendStdOut(version, (char* const[]){ - exe->chars, - "-v", - NULL - })) return false; + if (ffProcessAppendStdOut(version, (char* const[]){ exe->chars, "-v", NULL }) != NULL) + return false; ffStrbufTrimRightSpace(version); ffStrbufSubstrBeforeFirstC(version, '-'); return true; } + #ifdef _WIN32 static bool getShellVersionWinPowerShell(FFstrbuf* exe, FFstrbuf* version) { const char* env = getenv("POWERSHELL_VERSION"); From 8dc2d3929952a8f3d983f689f29659f2cc09b648 Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:54:53 +0200 Subject: [PATCH 5/6] remove a comment --- src/detection/terminalshell/terminalshell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index 0a2135a2fe..905eca2c48 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -307,7 +307,7 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version) return getExeVersionGeneral(exe, version); // brush 0.2.23 (git:2835487) } if (ffStrEqualsIgnCase(exeName, "tidalshell")) { - return getShellVersionTidalshell(exe, version); // brush 0.2.23 (git:2835487) + return getShellVersionTidalshell(exe, version); } #ifdef _WIN32 if (ffStrEqualsIgnCase(exeName, "powershell") || ffStrEqualsIgnCase(exeName, "powershell_ise")) { From f9482d4b2f371b1dfc26716278d03201ae395569 Mon Sep 17 00:00:00 2001 From: cereal Date: Tue, 30 Jun 2026 19:56:44 +0200 Subject: [PATCH 6/6] ignore tidalshell as terminal --- src/detection/terminalshell/terminalshell_linux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index a01851538a..35c050c7c1 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -107,6 +107,7 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid) { ffStrbufEqualS(&result->processName, "chezmoi") || // #762 ffStrbufEqualS(&result->processName, "proot") || ffStrbufEqualS(&result->processName, "script") || + ffStrbufEqualS(&result->processName, "tidalshell") || #ifdef __linux__ ffStrbufStartsWithS(&result->processName, "Relay(") || // Unknown process in WSL2 ffStrbufStartsWithS(&result->processName, "flatpak-") || // #707