Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable the progress bar if stdout is redirected

Browse Source
This commit is contained in:
Eelco Dolstra
2020-11-17 17:50:23 +01:00
parent 4b711bf3ce
commit 29ada5105b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libmain/progress-bar.cc
View File

@@ -705,12 +705,7 @@ public:
void writeToStdout(std::string_view s) override
{
auto state(state_.lock());
if (state->active) {
draw(*state, s);
} else {
Logger::writeToStdout(s);
}
Logger::writeToStdout(s);
}
std::optional<char> ask(std::string_view msg) override
@@ -729,7 +724,10 @@ Logger * makeProgressBar(bool printBuildLogs)
{
return new ProgressBar(
printBuildLogs,
isatty(STDERR_FILENO) && getEnv("TERM").value_or("dumb") != "dumb"
isatty(STDIN_FILENO)
&& isatty(STDOUT_FILENO)
&& isatty(STDERR_FILENO)
&& getEnv("TERM").value_or("dumb") != "dumb"
);
}