Merge remote-tracking branch 'lenormf/startup_info-no_kakrc'
This commit is contained in:
commit
4438895cd5
|
@ -1164,7 +1164,8 @@ int main(int argc, char* argv[])
|
||||||
auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) |
|
auto flags = (ignore_kakrc ? ServerFlags::IgnoreKakrc : ServerFlags::None) |
|
||||||
(parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) |
|
(parser.get_switch("d") ? ServerFlags::Daemon : ServerFlags::None) |
|
||||||
(parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) |
|
(parser.get_switch("ro") ? ServerFlags::ReadOnly : ServerFlags::None) |
|
||||||
((argc == 2 and ignore_kakrc) and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None);
|
((argc == 1 or (ignore_kakrc and argc == 2))
|
||||||
|
and isatty(0) ? ServerFlags::StartupInfo : ServerFlags::None);
|
||||||
auto debug_flags = option_from_string(Meta::Type<DebugFlags>{}, parser.get_switch("debug").value_or(""));
|
auto debug_flags = option_from_string(Meta::Type<DebugFlags>{}, parser.get_switch("debug").value_or(""));
|
||||||
return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files);
|
return run_server(session, server_init, client_init, init_coord, flags, ui_type, debug_flags, files);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user