From 28ca80717da67f90a3b33491e9807a053cf09c2d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 11 Nov 2023 11:02:07 +0100 Subject: guix: Properly compute progress bar width. * guix/progress.scm (progress-reporter/bar): Take font width into account to compute progress bar width. * guix/git.scm (show-progress): Take font width into account to compute progress bar width. Change-Id: I946e447c1ea7c6eb4ff805400280f39e8f1a7c02 --- guix/progress.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix/progress.scm') diff --git a/guix/progress.scm b/guix/progress.scm index 33cf6f4a1a..13d3ddc171 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -21,6 +21,8 @@ (define-module (guix progress) #:use-module (guix records) + #:use-module ((guix build syscalls) + #:select (terminal-string-width)) #:use-module (srfi srfi-19) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) @@ -307,7 +309,7 @@ tasks is performed. Write PREFIX at the beginning of the line." (if (string-null? prefix) (display (progress-bar ratio (current-terminal-columns)) port) (let ((width (- (current-terminal-columns) - (string-length prefix) 3))) + (terminal-string-width prefix) 3))) (display prefix port) (display " " port) (display (progress-bar ratio width) port))) -- cgit v1.2.3