nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull: Add '--url' option. 

* guix/scripts/pull.scm (%default-options): Add 'tarball-url' pair.
  (%options, show-help): Add '--url'.
  (guix-pull): Honor it.
This commit is contained in:
Ludovic Courtès 2013-10-12 17:14:41 +02:00
parent d8907ac43f
commit 0ad7da1e90
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/scripts/pull.scm
View File

@ -137,13 +137,15 @@ files."
(define %default-options (define %default-options
;; Alist of default option values. ;; Alist of default option values.
'()) `((tarball-url . ,%snapshot-url)))
(define (show-help) (define (show-help)
(display (_ "Usage: guix pull [OPTION]... (display (_ "Usage: guix pull [OPTION]...
Download and deploy the latest version of Guix.\n")) Download and deploy the latest version of Guix.\n"))
(display (_ " (display (_ "
--verbose produce verbose output")) --verbose produce verbose output"))
(display (_ "
--url=URL download the Guix tarball from URL"))
(display (_ " (display (_ "
--bootstrap use the bootstrap Guile to build the new Guix")) --bootstrap use the bootstrap Guile to build the new Guix"))
(newline) (newline)
@ -159,6 +161,10 @@ Download and deploy the latest version of Guix.\n"))
(list (option '("verbose") #f #f (list (option '("verbose") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'verbose? #t result))) (alist-cons 'verbose? #t result)))
(option '("url") #t #f
(lambda (opt name arg result)
(alist-cons 'tarball-url arg
(alist-delete 'tarball-url result))))
(option '("bootstrap") #f #f (option '("bootstrap") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'bootstrap? #t result))) (alist-cons 'bootstrap? #t result)))
@ -182,10 +188,10 @@ Download and deploy the latest version of Guix.\n"))
%default-options)) %default-options))
(with-error-handling (with-error-handling
(let ((opts (parse-options)) (let* ((opts (parse-options))
(store (open-connection))) (store (open-connection))
(let ((tarball (download-to-store store %snapshot-url (url (assoc-ref opts 'tarball-url)))
"guix-latest.tar.gz"))) (let ((tarball (download-to-store store url "guix-latest.tar.gz")))
(unless tarball (unless tarball
(leave (_ "failed to download up-to-date source, exiting\n"))) (leave (_ "failed to download up-to-date source, exiting\n")))
(parameterize ((%guile-for-build (parameterize ((%guile-for-build