From b1739029ef614dba2cb3ca5952b876d084acd7ea Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Thu, 23 Mar 2023 02:37:09 +0100 Subject: Shell: Evaluate the program name before parsing arguments Otherwise, we are too late to catch the "load the POSIX-compatible shellrc" branch. --- Userland/Shell/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Userland/Shell') diff --git a/Userland/Shell/main.cpp b/Userland/Shell/main.cpp index e01212bef4..77101d49f9 100644 --- a/Userland/Shell/main.cpp +++ b/Userland/Shell/main.cpp @@ -60,7 +60,7 @@ ErrorOr serenity_main(Main::Arguments arguments) editor = Line::Editor::construct(move(configuration)); editor->initialize(); - shell = Shell::Shell::construct(*editor, attempt_interactive, posix_mode || LexicalPath::basename(arguments.strings[0]) == "sh"sv); + shell = Shell::Shell::construct(*editor, attempt_interactive, posix_mode); s_shell = shell.ptr(); s_shell->setup_signals(); @@ -171,7 +171,7 @@ ErrorOr serenity_main(Main::Arguments arguments) StringView format; bool should_format_live = false; bool keep_open = false; - bool posix_mode = false; + bool posix_mode = (LexicalPath::basename(arguments.strings[0]) == "sh"sv); Core::ArgsParser parser; parser.add_option(command_to_run, "String to read commands from", "command-string", 'c', "command-string"); -- cgit v1.2.3