cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #3203 from hvdijk/prefetch-progress

Browse source 
Fix progress bar when nix-prefetch-url is piped.
This commit is contained in:
Eelco Dolstra 2019-11-04 09:28:17 +01:00 committed by GitHub
commit 8ec1b1e7b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/util.cc
View file

@ -1467,7 +1467,7 @@ static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};
static void updateWindowSize() static void updateWindowSize()
{ {
struct winsize ws; struct winsize ws;
if (ioctl(1, TIOCGWINSZ, &ws) == 0) { if (ioctl(2, TIOCGWINSZ, &ws) == 0) {
auto windowSize_(windowSize.lock()); auto windowSize_(windowSize.lock());
windowSize_->first = ws.ws_row; windowSize_->first = ws.ws_row;
windowSize_->second = ws.ws_col; windowSize_->second = ws.ws_col;

2
src/nix/progress-bar.cc
View file

@ -341,7 +341,7 @@ public:
} }
auto width = getWindowSize().second; auto width = getWindowSize().second;
if (width <= 0) std::numeric_limits<decltype(width)>::max(); if (width <= 0) width = std::numeric_limits<decltype(width)>::max();
writeToStderr("\r" + filterANSIEscapes(line, false, width) + "\e[K"); writeToStderr("\r" + filterANSIEscapes(line, false, width) + "\e[K");
} }