[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47464] [PATCH 3/8] scripts: download: Replace 'args-fold*' by 'pars
From: |
zimoun |
Subject: |
[bug#47464] [PATCH 3/8] scripts: download: Replace 'args-fold*' by 'parse-command-line'. |
Date: |
Mon, 29 Mar 2021 12:18:01 +0200 |
* guix/scripts/download.scm (define-command): Replace 'args-fold*' by
'parse-command-line'.
---
guix/scripts/download.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm
index ce8dd8b02c..5a91390358 100644
--- a/guix/scripts/download.scm
+++ b/guix/scripts/download.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2020 Ludovic Courtès
<ludo@gnu.org>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -162,15 +163,13 @@ and 'base16' ('hex' and 'hexadecimal' can be used as
well).\n"))
(define (parse-options)
;; Return the alist of option values.
- (args-fold* args %options
- (lambda (opt name arg result)
- (leave (G_ "~A: unrecognized option~%") name))
- (lambda (arg result)
- (when (assq 'argument result)
- (leave (G_ "~A: extraneous argument~%") arg))
-
- (alist-cons 'argument arg result))
- %default-options))
+ (parse-command-line args %options (list %default-options)
+ #:build-options? #f
+ #:argument-handler
+ (lambda (arg result)
+ (when (assq 'argument result)
+ (leave (G_ "~A: extraneous argument~%") arg))
+ (alist-cons 'argument arg result))))
(with-error-handling
(let* ((opts (parse-options))
--
2.30.1
- [bug#47464] [PATCH 0/8] scripts: Allow option hint for various subcommands., zimoun, 2021/03/29
- [bug#47464] [PATCH 1/8] scripts: describe: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 8/8] scripts: show: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 4/8] scripts: edit: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 2/8] scripts: discover: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 5/8] scripts: publish: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 3/8] scripts: download: Replace 'args-fold*' by 'parse-command-line'.,
zimoun <=
- [bug#47464] [PATCH 7/8] scripts: search: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29
- [bug#47464] [PATCH 6/8] scripts: repl: Replace 'args-fold*' by 'parse-command-line'., zimoun, 2021/03/29