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 SDwJO+AyAmC+UAAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 00:27:12 +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 CFDaNuAyAmCXUAAAB5/wlQ (envelope-from ) for ; Sat, 16 Jan 2021 00:27:12 +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 7864D940111 for ; Sat, 16 Jan 2021 00:27:12 +0000 (UTC) Received: from localhost ([::1]:59038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0ZQt-0005VM-BV for larch@yhetil.org; Fri, 15 Jan 2021 19:27:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0ZQk-0005Uq-MG for guix-patches@gnu.org; Fri, 15 Jan 2021 19:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0ZQk-00047x-FX for guix-patches@gnu.org; Fri, 15 Jan 2021 19:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0ZQk-0004zG-AN for guix-patches@gnu.org; Fri, 15 Jan 2021 19:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45893] [PATCH v2 1/3] scripts: search, show: Replace 'args-fold*' by 'parse-command-line'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 00:27:02 +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.161075681219130 (code B ref 45893); Sat, 16 Jan 2021 00:27:02 +0000 Received: (at 45893) by debbugs.gnu.org; 16 Jan 2021 00:26:52 +0000 Received: from localhost ([127.0.0.1]:41993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0ZQZ-0004yT-RE for submit@debbugs.gnu.org; Fri, 15 Jan 2021 19:26:52 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:43190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0ZQX-0004yD-2G for 45893@debbugs.gnu.org; Fri, 15 Jan 2021 19:26:50 -0500 Received: by mail-wr1-f52.google.com with SMTP id y17so10924040wrr.10 for <45893@debbugs.gnu.org>; Fri, 15 Jan 2021 16:26:49 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=IIv1cBTgejQa5nRLYEn+7s0SCQVAxj2t8VtQnuda2TE=; b=SJtrO/MS2KN/nVBvvvv1DOgLTmlw9e+xxLuwtYOv+s4hCyaPGAdY7Ybcv1v+nPJWOG zL2ZdfANR3du8Hs9tjC+A/+aoseRZ3SbPN/j3U/F0vHdsnbLCH02LB53ViRhmNBVHtfU rAAWs00FATG3xLUAhLUhxKz72K3uQpk3XbSrJ7FUhq45xts8sK1QJJuYcQLArDeqzedG 7ZxBaEdfcB9nR/sj7meDDI7Rwkt/NRC4/RErzkdDLpm/tr4zBuSmr2yFNJLMfds1knZD uSRFPgKY0hinjgp/uPFwStmV/YLYZpU+4iiOG7kjlRoWgrL8NgiU0MnkdaszhnEzmsmv dA+A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IIv1cBTgejQa5nRLYEn+7s0SCQVAxj2t8VtQnuda2TE=; b=T+Fex72rvgLn5Td+A6N/OoTuaKZp+8ncnBv/gLGufldcSsKm7oJl0V7+gNz5BrrUhe +6qBzn9VKKY1O37P8iPYuz0dBAU510SGWxm6VAOaruQY4CqKzJutNRKm01z4/3FYDm20 XO2hpYJ9GovRThYaZ+IASqbg+Cv/jfP4sVAbwDwEiw+7ZjfvWMETkSiUb7HzJO6rqIfZ nPxds3wgcat+dRR5d4I1ZT8g2SyL826yuPwNqmXn/+A9qUuTsMY+T45pw3sV1o30II+B XAjbBHGcZd8DNo7TkE9XN/h/AROgNGPRuDI+AzQQ1rkC8/dICcOP7GGsXuVjQrZjXaaW ggLw== X-Gm-Message-State: AOAM533wjBaW6W0pVQReAh7jYzDLYWUZC58pVGy2Zjf/ljulOONrrwmB yx2X7TU9JS0ZgPbRtw7QYGe4R5vEQC4= X-Google-Smtp-Source: ABdhPJwlfzgRVd5xHljtXAlrwuq8EaEqSDYqqkRZpWUCm94HPoifYLZhtM4xWfgoxiyKf7rmQPXPMA== X-Received: by 2002:adf:a2ca:: with SMTP id t10mr15395569wra.370.1610756803167; Fri, 15 Jan 2021 16:26:43 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id u16sm4797475wrn.68.2021.01.15.16.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 16:26:42 -0800 (PST) From: zimoun Date: Sat, 16 Jan 2021 01:26:32 +0100 Message-Id: <20210116002634.10401-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <865z3xlp2y.fsf@gmail.com> References: <865z3xlp2y.fsf@gmail.com> 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="SJtrO/MS"; 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: 7864D940111 X-Spam-Score: -1.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: d0A1TqimETBO * 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