diff options
| -rwxr-xr-x | guix/scripts/substitute.scm | 20 | ||||
| -rw-r--r-- | guix/store.scm | 10 |
2 files changed, 25 insertions, 5 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 82ce069598..db0416b0c0 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -31,7 +31,8 @@ #:use-module (guix pki) #:use-module ((guix build utils) #:select (mkdir-p dump-port)) #:use-module ((guix build download) - #:select (progress-proc uri-abbreviation + #:select (current-terminal-columns + progress-proc uri-abbreviation open-connection-for-uri close-connection store-path-abbreviation byte-count->string)) @@ -973,6 +974,14 @@ found." ;; daemon. '("http://hydra.gnu.org")))) +(define (client-terminal-columns) + "Return the number of columns in the client's terminal, if it is known, or a +default value." + (or (and=> (or (find-daemon-option "untrusted-terminal-columns") + (find-daemon-option "terminal-columns")) + string->number) + 80)) + (define (guix-substitute . args) "Implement the build daemon's substituter protocol." (mkdir-p %narinfo-cache-directory) @@ -1003,9 +1012,12 @@ found." (loop (read-line))))))) (("--substitute" store-path destination) ;; Download STORE-PATH and add store it as a Nar in file DESTINATION. - (process-substitution store-path destination - #:cache-urls %cache-urls - #:acl (current-acl))) + ;; Specify the number of columns of the terminal so the progress + ;; report displays nicely. + (parameterize ((current-terminal-columns (client-terminal-columns))) + (process-substitution store-path destination + #:cache-urls %cache-urls + #:acl (current-acl)))) (("--version") (show-version-and-exit "guix substitute")) (("--help") diff --git a/guix/store.scm b/guix/store.scm index 906611658e..af311a0ebd 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -22,6 +22,7 @@ #:use-module (guix serialization) #:use-module (guix monads) #:autoload (guix base32) (bytevector->base32-string) + #:autoload (guix build syscalls) (terminal-columns) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (srfi srfi-1) @@ -530,7 +531,10 @@ encoding conversion errors." ;; the daemon's settings are used. Otherwise, it ;; overrides the daemons settings; see 'guix ;; substitute'. - (substitute-urls #f)) + (substitute-urls #f) + + ;; Number of columns in the client's terminal. + (terminal-columns (terminal-columns))) ;; Must be called after `open-connection'. (define socket @@ -565,6 +569,10 @@ encoding conversion errors." ,@(if rounds `(("build-repeat" . ,(number->string (max 0 (1- rounds))))) + '()) + ,@(if terminal-columns + `(("terminal-columns" + . ,(number->string terminal-columns))) '())))) (send (string-pairs pairs)))) (let loop ((done? (process-stderr server))) |