me/guix
Archived
1
0
Fork 0
Code Activity

guix download: Honor the number of columns of the terminal.

Browse source 
* guix/scripts/download.scm (guix-download): Parameterize
'current-terminal-columns'.
This commit is contained in:
Ludovic Courtès 2016-04-15 00:08:28 +02:00
parent 9703fef415
commit cc44fbb8d9
1 changed files with 7 additions and 3 deletions

10
guix/scripts/download.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,6 +24,8 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix base32) #:use-module (guix base32)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix build download) #:select (current-terminal-columns))
#:use-module ((guix build syscalls) #:select (terminal-columns))
#:use-module (web uri) #:use-module (web uri)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -115,8 +117,10 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
(add-to-store store (basename (uri-path uri)) (add-to-store store (basename (uri-path uri))
#f "sha256" (uri-path uri))) #f "sha256" (uri-path uri)))
(else (else
(download-to-store store (uri->string uri) (parameterize ((current-terminal-columns
(basename (uri-path uri)))))) (terminal-columns)))
(download-to-store store (uri->string uri)
(basename (uri-path uri)))))))
(hash (call-with-input-file (hash (call-with-input-file
(or path (or path
(leave (_ "~a: download failed~%") (leave (_ "~a: download failed~%")