diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-30 14:38:13 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-01 16:00:14 +0100 |
| commit | e261e27676c018f23fb6c6fdc282e2dd40fa1985 (patch) | |
| tree | ed4ce2cde522cdfdd76ff429f70736c81f660d96 /guix/scripts | |
| parent | e4ecd51e239adba226709a793240cc6f1a396858 (diff) | |
| download | gnu-guix-e261e27676c018f23fb6c6fdc282e2dd40fa1985.tar gnu-guix-e261e27676c018f23fb6c6fdc282e2dd40fa1985.tar.gz | |
guix system: 'init' displays a progress bar while copying.
Until now it would print the name of each store item being copied, which
was verbose and unhelpful.
* guix/scripts/system.scm (copy-closure): Use 'progress-reporter/bar'
and 'call-with-progress-reporter'.
(guix-system): Parameterize 'current-terminal-columns'.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/system.scm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index acfa5fdbfd..91d151d22b 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -36,6 +36,8 @@ #:use-module (guix graph) #:use-module (guix scripts graph) #:use-module (guix build utils) + #:use-module (guix progress) + #:use-module ((guix build syscalls) #:select (terminal-columns)) #:use-module (gnu build install) #:autoload (gnu build file-systems) (find-partition-by-label find-partition-by-uuid) @@ -141,8 +143,18 @@ REFERENCES as its set of references." TARGET, and register them." (mlet* %store-monad ((to-copy (topologically-sorted* (list item))) (refs (mapm %store-monad references* to-copy))) - (for-each (cut copy-item <> <> target #:log-port log-port) - to-copy refs) + (define progress-bar + (progress-reporter/bar (length to-copy) + (format #f (G_ "copying to '~a'...") + target))) + + (call-with-progress-reporter progress-bar + (lambda (report) + (let ((void (%make-void-port "w"))) + (for-each (lambda (item refs) + (copy-item item refs target #:log-port void) + (report)) + to-copy refs)))) (return *unspecified*))) @@ -1092,7 +1104,8 @@ argument list and OPTS is the option alist." parse-sub-command)) (args (option-arguments opts)) (command (assoc-ref opts 'action))) - (parameterize ((%graft? (assoc-ref opts 'graft?))) + (parameterize ((%graft? (assoc-ref opts 'graft?)) + (current-terminal-columns (terminal-columns))) (process-command command args opts))))) ;;; Local Variables: |