TerminalShell (Linux): relax detection of terminals in NixOS

CarterLi · CarterLi · commit f973572c5a64 · 2025-01-03T10:18:44.000+08:00
Fix #1479
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
@@ -313,11 +313,11 @@ static void setShellInfoDetails(FFShellResult* result)
 
 static void setTerminalInfoDetails(FFTerminalResult* result)
 {
-    if(ffStrbufStartsWithC(&result->processName, '.') && ffStrbufEndsWithS(&result->processName, "-wrapped"))
+    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
-        ffStrbufSubstrBefore(&result->processName, result->processName.length - (uint32_t) strlen("-wrapped"));
+        ffStrbufSubstrBeforeLastC(&result->processName, '-');
         ffStrbufSubstrAfter(&result->processName, 0);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -313,11 +313,11 @@ static void setShellInfoDetails(FFShellResult* result)`
`313`	`313`
`314`	`314`	`static void setTerminalInfoDetails(FFTerminalResult* result)`
`315`	`315`	`{`
`316`		`- if(ffStrbufStartsWithC(&result->processName, '.') && ffStrbufEndsWithS(&result->processName, "-wrapped"))`
	`316`	`+ if(ffStrbufStartsWithC(&result->processName, '.') && ffStrbufContainS(&result->processName, "-wrap"))`
`317`	`317`	`{`
`318`	`318`	`// For NixOS. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428`
`319`	`319`	`// We use processName when detecting version and font, overriding it for simplification`
`320`		`- ffStrbufSubstrBefore(&result->processName, result->processName.length - (uint32_t) strlen("-wrapped"));`
	`320`	`+ ffStrbufSubstrBeforeLastC(&result->processName, '-');`
`321`	`321`	`ffStrbufSubstrAfter(&result->processName, 0);`
`322`	`322`	`}`
`323`	`323`