From 0ad7da1e90d479fa82dbb0cabf858e1b7a120c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Oct 2013 17:14:41 +0200 Subject: [PATCH] pull: Add '--url' option. * guix/scripts/pull.scm (%default-options): Add 'tarball-url' pair. (%options, show-help): Add '--url'. (guix-pull): Honor it. --- guix/scripts/pull.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 023b83e6a3..1ee1c91142 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -137,13 +137,15 @@ files." (define %default-options ;; Alist of default option values. - '()) + `((tarball-url . ,%snapshot-url))) (define (show-help) (display (_ "Usage: guix pull [OPTION]... Download and deploy the latest version of Guix.\n")) (display (_ " --verbose produce verbose output")) + (display (_ " + --url=URL download the Guix tarball from URL")) (display (_ " --bootstrap use the bootstrap Guile to build the new Guix")) (newline) @@ -159,6 +161,10 @@ Download and deploy the latest version of Guix.\n")) (list (option '("verbose") #f #f (lambda (opt name arg 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 (lambda (opt name arg result) (alist-cons 'bootstrap? #t result))) @@ -182,10 +188,10 @@ Download and deploy the latest version of Guix.\n")) %default-options)) (with-error-handling - (let ((opts (parse-options)) - (store (open-connection))) - (let ((tarball (download-to-store store %snapshot-url - "guix-latest.tar.gz"))) + (let* ((opts (parse-options)) + (store (open-connection)) + (url (assoc-ref opts 'tarball-url))) + (let ((tarball (download-to-store store url "guix-latest.tar.gz"))) (unless tarball (leave (_ "failed to download up-to-date source, exiting\n"))) (parameterize ((%guile-for-build