unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#62056] [PATCH] guix: Only issue erase-current-line sequence for ttys.
@ 2023-03-08 15:55 Bruno Victal
  2023-03-16 21:30 ` Ludovic Courtès
  2024-06-02 20:19 ` [bug#62056] Custom progress reporter for scripts/substitute.scm Richard Sent
  0 siblings, 2 replies; 6+ messages in thread
From: Bruno Victal @ 2023-03-08 15:55 UTC (permalink / raw)
  To: 62056; +Cc: Bruno Victal

* guix/progress.scm (erase-current-line): Only issue erase-current-line sequence for ttys.
---

Avoids cluttering log lines with �[K when output is logged to a file.

 guix/progress.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/guix/progress.scm b/guix/progress.scm
index 33cf6f4a1a..a1cdd25557 100644
--- a/guix/progress.scm
+++ b/guix/progress.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Steve Sprang <scs@stevesprang.com>
 ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -209,9 +210,12 @@ (define* (progress-bar % #:optional (bar-width 20))
                    (string (progress-bar-style-stop bar-style)))))
 
 (define (erase-current-line port)
-  "Write an ANSI erase-current-line sequence to PORT to erase the whole line and
-move the cursor to the beginning of the line."
-  (display "\r\x1b[K" port))
+  "When @var{port} is interactive, write an ANSI erase-current-line sequence
+to erase the whole line and move the cursor to the beginning of the line,
+otherwise write a newline."
+  (if (isatty? port)
+      (display "\r\x1b[K" port)
+      (newline port)))
 
 (define* (display-download-progress file size
                                     #:key

base-commit: 85d4e8af5baf9b0a9cadf95d802674d0254433da
-- 
2.39.1





^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-06-03  4:48 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-08 15:55 [bug#62056] [PATCH] guix: Only issue erase-current-line sequence for ttys Bruno Victal
2023-03-16 21:30 ` Ludovic Courtès
2023-03-18 11:27   ` Bruno Victal
2023-04-18 20:02     ` Ludovic Courtès
2023-05-28  9:54       ` Bruno Victal
2024-06-02 20:19 ` [bug#62056] Custom progress reporter for scripts/substitute.scm Richard Sent

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).