RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:18:12 +00:00
Code Issues Activity Actions

Shell: Allow assignment-prefixed commands to run builtins

Browse source 
`env` is not capable of running shell builtins, so make a simple
builtin in its place.
This commit is contained in:
Ali Mohammad Pur 2023-04-19 12:19:14 +03:30 • committed by Ali Mohammad Pur
parent e2336d9de5
commit fca5a34ad3
3 changed files with 131 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Userland/Shell/Builtin.cpp
View file

@ -1876,6 +1876,62 @@ ErrorOr<int> Shell::builtin_read(Main::Arguments arguments)
return 0;
}
ErrorOr<int> Shell::builtin_run_with_env(Main::Arguments arguments)
{
Vector<DeprecatedString> environment_variables;
Vector<StringView> command_and_arguments;
Core::ArgsParser parser;
parser.add_option(environment_variables, "Environment variables to set", "env", 'e', "NAME=VALUE");
parser.add_positional_argument(command_and_arguments, "Command and arguments to run", "command", Core::ArgsParser::Required::Yes);
parser.set_stop_on_first_non_option(true);
if (!parser.parse(arguments, Core::ArgsParser::FailureBehavior::Ignore))
return 1;
if (command_and_arguments.is_empty()) {
warnln("run_with_env: No command to run");
return 1;
}
AST::Command command;
TRY(command.argv.try_ensure_capacity(command_and_arguments.size()));
for (auto& arg : command_and_arguments)
command.argv.append(TRY(String::from_utf8(arg)));
auto commands = TRY(expand_aliases({ move(command) }));
HashMap<DeprecatedString, Optional<DeprecatedString>> old_environment_entries;
for (auto& variable : environment_variables) {
auto parts = variable.split_limit('=', 2, SplitBehavior::KeepEmpty);
if (parts.size() != 2) {
warnln("run_with_env: Invalid environment variable: '{}'", variable);
return 1;
}
DeprecatedString name = parts[0];
old_environment_entries.set(name, getenv(name.characters()) ?: Optional<DeprecatedString> {});
DeprecatedString value = parts[1];
setenv(name.characters(), value.characters(), 1);
}
int exit_code = 0;
for (auto& job : run_commands(commands)) {
block_on_job(job);
exit_code = job->exit_code();
}
for (auto& entry : old_environment_entries) {
if (entry.value.has_value())
setenv(entry.key.characters(), entry.value->characters(), 1);
else
unsetenv(entry.key.characters());
}
return exit_code;
}
bool Shell::has_builtin(StringView name) const
{
if (name == ":"sv)