From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mBZqGefFAWAEfAAA0tVLHw (envelope-from ) for ; Fri, 15 Jan 2021 16:42:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id mIUxFefFAWBPJQAAB5/wlQ (envelope-from ) for ; Fri, 15 Jan 2021 16:42:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F2167940483 for ; Fri, 15 Jan 2021 16:42:14 +0000 (UTC) Received: from localhost ([::1]:47154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0SAv-0000RM-O3 for larch@yhetil.org; Fri, 15 Jan 2021 11:42:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0S9m-00085R-8d for guix-patches@gnu.org; Fri, 15 Jan 2021 11:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0S9l-0000nC-UP for guix-patches@gnu.org; Fri, 15 Jan 2021 11:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0S9l-0006NW-Qn for guix-patches@gnu.org; Fri, 15 Jan 2021 11:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45893] [PATCH 1/2] scripts: search, show: Replace 'args-fold*' by 'parse-command-line'. References: <20210115163732.53665-1-zimon.toutoune@gmail.com> In-Reply-To: <20210115163732.53665-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Jan 2021 16:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45893@debbugs.gnu.org Received: via spool by 45893-submit@debbugs.gnu.org id=B45893.161072880424425 (code B ref 45893); Fri, 15 Jan 2021 16:41:01 +0000 Received: (at 45893) by debbugs.gnu.org; 15 Jan 2021 16:40:04 +0000 Received: from localhost ([127.0.0.1]:41563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0S8p-0006Lt-Ge for submit@debbugs.gnu.org; Fri, 15 Jan 2021 11:40:03 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:43645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0S8n-0006LF-B9 for 45893@debbugs.gnu.org; Fri, 15 Jan 2021 11:40:02 -0500 Received: by mail-wr1-f42.google.com with SMTP id y17so9902094wrr.10 for <45893@debbugs.gnu.org>; Fri, 15 Jan 2021 08:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IIv1cBTgejQa5nRLYEn+7s0SCQVAxj2t8VtQnuda2TE=; b=Fc+m7k4jp8ZNADwPrAb08hphhkyU9Wi8aMd8VDyrBl05kVHoBxm9G5Xt3UsUggOYmx bMYoxjGjkQwXVlpMeCa9fZOc3pFR5lsFITxhahovVDkLGtF+WcqzaCDSOq9YA7koA4vm keAZHQwhsck7TdsTmA+4itJD4LOSRPED98PoW1uq0IrPqF8eu+9mUqlnmgxYV3ulHSgT 7kC5eV0PYco7cGTLS6QXKGhkzfMtPCHyZWT953XehUlikcm7HJ+fF2wJZLq3IgnJjJ+k kQKZdQRXpVlgg8tTAFjsbSJbQqDRMj5093u8pi2JF1Pm3D8Y4nd/Xpci1DkrZW2gd5GD cXfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IIv1cBTgejQa5nRLYEn+7s0SCQVAxj2t8VtQnuda2TE=; b=pQYNrqjQPG65y0xVgZHOw0puQMSfG57kTuuvAvKw8PILzfG4J9+jIzh/uDRfhuiAJQ 1JYPedzb7jZpEhDEygUcBpZRf+NOqi3rBHb5GE1Gd0znaVSpR9RwJitC99CfrHer176y AU4oGYqXeja5bKrpNCL5oVzXEy7EjTKl94ruJSg9D6bHIhwknYP7JMZrzoIrtLYkhWYF lbVb7r7cz2BD/91omFtAh1OsHJHTBZmbOWm9V34d+2zssrFezZl2Dy98nDcW1pkk4BRQ pNSR3ThDqI8CA6sUN5G6zXf3mlEZdDsk+9f5QE+DF/1ad2ufYPedgpOa64p+RFUMSBq7 X7lw== X-Gm-Message-State: AOAM532pJAZtSV/yG6iheakqrQ3RjtmL8arwFk0Z41HxSL23QII2jVKS jFLPfU9DG5Uwj3V6qhvYjg29QzMEk1Y= X-Google-Smtp-Source: ABdhPJxi2D/jnvsD/uE1cfvfzmkZFbo6w/Bs3s9x+A/rttMC+0wQttTcAz7hTVnViMo2LnQVD1K/9Q== X-Received: by 2002:a5d:457a:: with SMTP id a26mr14280569wrc.53.1610728795538; Fri, 15 Jan 2021 08:39:55 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id y63sm13744574wmd.21.2021.01.15.08.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 08:39:55 -0800 (PST) From: zimoun Date: Fri, 15 Jan 2021 17:39:52 +0100 Message-Id: <20210115163953.53721-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=Fc+m7k4j; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F2167940483 X-Spam-Score: -1.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: aIAFY+abFMFa * guix/scripts/search.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. * guix/scripts/show.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/search.scm | 7 ++----- guix/scripts/show.scm | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm index 0c9e6af07b..1ac8089e6b 100644 --- a/guix/scripts/search.scm +++ b/guix/scripts/search.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,11 +67,7 @@ This is an alias for 'guix package -s'.\n")) result)) (define opts - (args-fold* args %options - (lambda (opt name arg . rest) - (leave (G_ "~A: unrecognized option~%") name)) - handle-argument - '())) + (parse-command-line args %options '())) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no regular expressions to search for~%"))) diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm index 535d03c1a6..6dfc082be3 100644 --- a/guix/scripts/show.scm +++ b/guix/scripts/show.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Simon Tournier +;;; Copyright © 2019, 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,11 +66,7 @@ This is an alias for 'guix package --show='.\n")) result)) (define opts - (args-fold* args %options - (lambda (opt name arg . rest) - (leave (G_ "~A: unrecognized option~%") name)) - handle-argument - '())) + (parse-command-line args %options '())) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no package to show~%"))) -- 2.29.2