TerminalShell: fix terminal name detection on NixOS

CarterLi · CarterLi · commit f93341ac61ca · 2023-11-08T09:02:52.000+08:00
oops. No one report that...
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
@@ -361,13 +361,13 @@ const FFTerminalShellResult* ffDetectTerminalShell()
         ffStrbufInitS(&result.shellPrettyName, result.shellExeName);
     }
 
-    if(result.terminalExeName[0] == '.' && ffStrEndsWith(result.terminalExeName, "-wrapper"))
+    if(result.terminalExeName[0] == '.' && ffStrEndsWith(result.terminalExeName, "-wrapped"))
     {
         // For NixOS. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428
         // We use terminalProcessName when detecting version and font, overriding it for simplication
         ffStrbufSetNS(
             &result.terminalProcessName,
-            (uint32_t) (strlen(result.terminalExeName) - strlen(".-wrapper")),
+            (uint32_t) (strlen(result.terminalExeName) - strlen(".-wrapped")),
             result.terminalExeName + 1);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -361,13 +361,13 @@ const FFTerminalShellResult* ffDetectTerminalShell()`
`361`	`361`	`ffStrbufInitS(&result.shellPrettyName, result.shellExeName);`
`362`	`362`	`}`
`363`	`363`
`364`		`- if(result.terminalExeName[0] == '.' && ffStrEndsWith(result.terminalExeName, "-wrapper"))`
	`364`	`+ if(result.terminalExeName[0] == '.' && ffStrEndsWith(result.terminalExeName, "-wrapped"))`
`365`	`365`	`{`
`366`	`366`	`// For NixOS. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428`
`367`	`367`	`// We use terminalProcessName when detecting version and font, overriding it for simplication`
`368`	`368`	`ffStrbufSetNS(`
`369`	`369`	`&result.terminalProcessName,`
`370`		`- (uint32_t) (strlen(result.terminalExeName) - strlen(".-wrapper")),`
	`370`	`+ (uint32_t) (strlen(result.terminalExeName) - strlen(".-wrapped")),`
`371`	`371`	`result.terminalExeName + 1);`
`372`	`372`	`}`
`373`	`373`