Shell: add JSON config support

This commit is contained in:
李通洲
2023-06-01 11:37:52 +08:00
committed by 李通洲
parent fa28529308
commit 786d538276
14 changed files with 140 additions and 58 deletions
@@ -353,7 +353,7 @@ const FFTerminalShellResult* ffDetectTerminalShell(const FFinstance* instance)
getUserShellFromEnv(instance, &result);
ffStrbufClear(&result.shellVersion);
if(instance->config.shellVersion)
if(instance->config.shell.version)
{
getShellVersion(&result.shellExe, result.shellExeName, &result.shellVersion);
@@ -152,7 +152,7 @@ static uint32_t getShellInfo(const FFinstance* instance, FFTerminalShellResult*
}
ffStrbufClear(&result->shellVersion);
if(instance->config.shellVersion)
if(instance->config.shell.version)
fftsGetShellVersion(&result->shellExe, result->shellPrettyName.chars, &result->shellVersion);
result->shellPid = pid;