nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 09:49:36 +01:00
Code 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

10
src/libmain/progress-bar.cc
View file

@ -705,13 +705,8 @@ public:
void writeToStdout(std::string_view s) override 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 std::optional<char> ask(std::string_view msg) override
{ {
@ -729,7 +724,10 @@ Logger * makeProgressBar(bool printBuildLogs)
{ {
return new ProgressBar( return new ProgressBar(
printBuildLogs, 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"
); );
} }