emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-install: fetch_cb.c: do not print ANSI escape codes if stdout isn't a tty.

Browse Source
This commit is contained in:
Juan RP 2012-12-10 11:09:18 +01:00
parent 1d42986b75
commit ca5aeebdc9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/xbps-install/fetch_cb.c
View File

@ -144,9 +144,14 @@ stat_display(struct xbps_fetch_cb_data *xfpd, void *cbdata)
(double)xfpd->file_dloaded) / (double)xfpd->file_size); (double)xfpd->file_dloaded) / (double)xfpd->file_size);
(void)xbps_humanize_number(totsize, (int64_t)xfpd->file_size); (void)xbps_humanize_number(totsize, (int64_t)xfpd->file_size);
} }
fprintf(stderr, "%s: [%s %d%%] %s ETA: %s\033[K\r", if (isatty(fileno(stdout)))
xfpd->file_name, totsize, percentage, printf("%s: [%s %d%%] %s ETA: %s\033[K\r",
stat_bps(xfpd, xfer), stat_eta(xfpd, xfer)); xfpd->file_name, totsize, percentage,
stat_bps(xfpd, xfer), stat_eta(xfpd, xfer));
else
printf("%s: [%s %d%%] %s ETA: %s\n",
xfpd->file_name, totsize, percentage,
stat_bps(xfpd, xfer), stat_eta(xfpd, xfer));
} }
void void
@ -165,7 +170,11 @@ fetch_file_progress_cb(struct xbps_fetch_cb_data *xfpd, void *cbdata)
} else if (xfpd->cb_end) { } else if (xfpd->cb_end) {
/* end transfer stats */ /* end transfer stats */
(void)xbps_humanize_number(size, (int64_t)xfpd->file_dloaded); (void)xbps_humanize_number(size, (int64_t)xfpd->file_dloaded);
fprintf(stderr,"%s: %s [avg rate: %s]\033[K\n", if (isatty(fileno(stdout)))
xfpd->file_name, size, stat_bps(xfpd, xfer)); printf("%s: %s [avg rate: %s]\033[K\n",
xfpd->file_name, size, stat_bps(xfpd, xfer));
else
printf("%s: %s [avg rate: %s]\n",
xfpd->file_name, size, stat_bps(xfpd, xfer));
} }
} }