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

Terminal (Linux): improves terminal name detection for nix packages (#2352)

Browse Source 
* Improved terminal name detection for nix packages

* Improved terminal name detection for nix packages

* Update terminalshell_linux.c

Move ffStrbufStartsWithC(&result->processName, '.') before string comparation, as it's much cheaper.
This commit is contained in:
SirSputnikWiki
2026-05-30 02:16:12 +00:00
committed by GitHub
parent 1689fc81e9
commit 90bbfe195f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/terminalshell/terminalshell_linux.c
+7 -5
View File
@@ -294,11 +294,13 @@ static void setShellInfoDetails(FFShellResult* result) {
}
static void setTerminalInfoDetails(FFTerminalResult* result) {
if (ffStrbufStartsWithC(&result->processName, '.') && ffStrbufContainS(&result->processName, "-wrap")) {
// For NixOS. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428
// We use processName when detecting version and font, overriding it for simplification
ffStrbufSubstrBeforeLastC(&result->processName, '-');
// For Nixpkgs. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428
// We use processName when detecting version and font, overriding it for simplification
if (ffStrbufStartsWithC(&result->processName, '.') && ffStrbufStartsWithS(&result->exePath,"/nix/store")) {
ffStrbufSubstrAfter(&result->processName, 0);
if (strlen(result->exeName) < 15) {
ffStrbufSubstrBeforeLastC(&result->processName, '-');
}
}
if (ffStrbufEqualS(&result->processName, "wezterm-gui")) {
@@ -357,7 +359,7 @@ static void setTerminalInfoDetails(FFTerminalResult* result) {
#endif
else if (strncmp(result->exeName, result->processName.chars, result->processName.length) == 0) { // if exeName starts with processName, print it. Otherwise print processName
else if (strncmp(result->exeName, result->processName.chars, result->processName.length) == 0 || (ffStrbufStartsWithS(&result->exePath,"/nix/store") && strlen(result->exeName) > 15)) { // if exeName starts with processName, print it. Otherwise print processName. For nixpkgs, use exeName if processName can't be unwrapped
ffStrbufInitS(&result->prettyName, result->exeName);
} else {
ffStrbufInitCopy(&result->prettyName, &result->processName);