RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 20:15:07 +00:00
Code Issues Activity Actions

Shell: Allow builtins and functions as conditions for 'if'

Browse source
This commit is contained in:
AnotherTest 2020-09-14 14:57:30 +04:30 • committed by Andreas Kling
parent 2b867ff555
commit cd0ddf27f3
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Shell/Shell.cpp
View file

@ -591,10 +591,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
return nullptr;
}
int retval = 0;
if (run_builtin(command, rewirings, retval)) {
if (run_builtin(command, rewirings, last_return_code)) {
for (auto& next_in_chain : command.next_chain)
run_tail(next_in_chain, retval);
run_tail(next_in_chain, last_return_code);
return nullptr;
}
@ -610,9 +609,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
}
}
if (invoke_function(command, retval)) {
if (invoke_function(command, last_return_code)) {
for (auto& next_in_chain : command.next_chain)
run_tail(next_in_chain, retval);
run_tail(next_in_chain, last_return_code);
return nullptr;
}
}