aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-15 10:47:01 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-15 11:53:21 +0100
commit3e0a42973b90cfaa39b36f1a0c6c39d71f5e317c (patch)
treef24876c40103f9275a0c4650483f8705f2a49ed7
parente22482038611a53a9d2b25df20363664cd91be2e (diff)
downloadguix-3e0a42973b90cfaa39b36f1a0c6c39d71f5e317c.tar
guix-3e0a42973b90cfaa39b36f1a0c6c39d71f5e317c.tar.gz
progress: Rename 'erase-in-line' to 'erase-current-line'.
Suggested by Danny Milosavljevic <dannym@scratchpost.org>. * guix/progress.scm (erase-in-line): Rename to... (erase-current-line): ... this. Adjust callers.
-rw-r--r--guix/progress.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/progress.scm b/guix/progress.scm
index 0ca5c08782..c9c3cd12a0 100644
--- a/guix/progress.scm
+++ b/guix/progress.scm
@@ -178,8 +178,8 @@ width of the bar is BAR-WIDTH."
(make-string filled #\#)
(make-string empty #\space))))
-(define (erase-in-line port)
- "Write an ANSI erase-in-line sequence to PORT to erase the whole line and
+(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))
@@ -206,7 +206,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput)
(seconds->string elapsed)
(progress-bar %) %)))
- (erase-in-line log-port)
+ (erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
@@ -218,7 +218,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput)
(seconds->string elapsed)
(byte-count->string transferred))))
- (erase-in-line log-port)
+ (erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
@@ -248,7 +248,7 @@ tasks is performed. Write PREFIX at the beginning of the line."
(set! done (+ 1 done))
(unless (> done total)
(let* ((ratio (* 100. (/ done total))))
- (erase-in-line port)
+ (erase-current-line port)
(if (string-null? prefix)
(display (progress-bar ratio (current-terminal-columns)) port)
(let ((width (- (current-terminal-columns)
@@ -263,7 +263,7 @@ tasks is performed. Write PREFIX at the beginning of the line."
(set! done 0)))
(report report-progress)
(stop (lambda ()
- (erase-in-line port)
+ (erase-current-line port)
(unless (string-null? prefix)
(display prefix port)
(newline port))