me/guix
Archived
1
0
Fork 0
Code Activity

guix system: 'init' displays a progress bar while copying.

Browse source 
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'.
This commit is contained in:
Ludovic Courtès 2017-11-30 14:38:13 +01:00
parent e4ecd51e23
commit e261e27676
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
guix/scripts/system.scm
View file

@ -36,6 +36,8 @@
#:use-module (guix graph) #:use-module (guix graph)
#:use-module (guix scripts graph) #:use-module (guix scripts graph)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (guix progress)
#:use-module ((guix build syscalls) #:select (terminal-columns))
#:use-module (gnu build install) #:use-module (gnu build install)
#:autoload (gnu build file-systems) #:autoload (gnu build file-systems)
(find-partition-by-label find-partition-by-uuid) (find-partition-by-label find-partition-by-uuid)
@ -141,8 +143,18 @@ REFERENCES as its set of references."
TARGET, and register them." TARGET, and register them."
(mlet* %store-monad ((to-copy (topologically-sorted* (list item))) (mlet* %store-monad ((to-copy (topologically-sorted* (list item)))
(refs (mapm %store-monad references* to-copy))) (refs (mapm %store-monad references* to-copy)))
(for-each (cut copy-item <> <> target #:log-port log-port) (define progress-bar
to-copy refs) (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*))) (return *unspecified*)))
@ -1092,7 +1104,8 @@ argument list and OPTS is the option alist."
parse-sub-command)) parse-sub-command))
(args (option-arguments opts)) (args (option-arguments opts))
(command (assoc-ref opts 'action))) (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))))) (process-command command args opts)))))
;;; Local Variables: ;;; Local Variables: