RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:57:45 +00:00
Code Issues Activity Actions

Shell: Make the 'not' builtin return the correct exit code for functions

Browse source
This commit is contained in:
AnotherTest 2021-03-07 09:55:02 +03:30 • committed by Andreas Kling
parent fec8d7d699
commit 4f6bf2931c
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Shell/Builtin.cpp
View file

@ -892,10 +892,15 @@ int Shell::builtin_not(int argc, const char** argv)
auto commands = expand_aliases({ move(command) }); auto commands = expand_aliases({ move(command) });
int exit_code = 1; int exit_code = 1;
auto found_a_job = false;
for (auto& job : run_commands(commands)) { for (auto& job : run_commands(commands)) {
found_a_job = true;
block_on_job(job); block_on_job(job);
exit_code = job.exit_code(); exit_code = job.exit_code();
} }
// In case it was a function.
if (!found_a_job)
exit_code = last_return_code;
return exit_code == 0 ? 1 : 0; return exit_code == 0 ? 1 : 0;
} }