From unknown Mon Jun 23 07:48:16 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#30495 <30495@debbugs.gnu.org> To: bug#30495 <30495@debbugs.gnu.org> Subject: Status: [PATCH] bash completion: Complete files names after 'guix package -m'. Reply-To: bug#30495 <30495@debbugs.gnu.org> Date: Mon, 23 Jun 2025 14:48:16 +0000 retitle 30495 [PATCH] bash completion: Complete files names after 'guix pac= kage -m'. reassign 30495 guix-patches submitter 30495 Oleg Pykhalov severity 30495 normal tag 30495 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 04:08:12 2018 Received: (at submit) by debbugs.gnu.org; 17 Feb 2018 09:08:12 +0000 Received: from localhost ([127.0.0.1]:47467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emyTc-0004Cr-2n for submit@debbugs.gnu.org; Sat, 17 Feb 2018 04:08:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1emyTa-0004Ca-K5 for submit@debbugs.gnu.org; Sat, 17 Feb 2018 04:08:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emyTU-00058p-Gl for submit@debbugs.gnu.org; Sat, 17 Feb 2018 04:08:05 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emyTU-00058l-Ct for submit@debbugs.gnu.org; Sat, 17 Feb 2018 04:08:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emyTT-0004zO-ES for guix-patches@gnu.org; Sat, 17 Feb 2018 04:08:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emyTP-00056Q-FX for guix-patches@gnu.org; Sat, 17 Feb 2018 04:08:03 -0500 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:40295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emyTP-00055i-7T for guix-patches@gnu.org; Sat, 17 Feb 2018 04:07:59 -0500 Received: by mail-lf0-x22e.google.com with SMTP id 37so7041020lfs.7 for ; Sat, 17 Feb 2018 01:07:58 -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=E2Vg+ufOysSwi4xlKB31Z5xtM5GwNMSrSPf01pD+p+8=; b=eBkxeNxDnFaMHWZpun4Yjj0jGYfNJuDTPYui6r9jOoQQ1Lt/o0nDySmQvNoJ2T9d6u qMkQjP7iAL2jfbgeRbHPQR8yMQeZfq1b8ov3gicOWhiEsko7aml5/sn+L6NsBIUVTmHe iagPuRIyrszaInooP4X+LIytdi05MVYsJ+YPliPGQYsMk3lECkuoN/j+cIrXxSFCXAuU pVcx+XDHfIVEtfItJ401Nj3ThunjIyNCfuGv7t81TJkN7zINUxk+RZQ5/AQ6GQNnrSu4 RlsVhPCbRVUDraZcxAfEm+h5ADifLpzHHzgER2wYtNQTdW+cdozV0/zvppREl+ROFXJJ VqoA== 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=E2Vg+ufOysSwi4xlKB31Z5xtM5GwNMSrSPf01pD+p+8=; b=b/5RSGB3ntQHjKw8RoCxPGKuW2eu4B79Z1JfHqnehaaiFdK9oK4D4enFH+tBa8TF3r CZol7zFgczBsPSfXCDa4nvejT3ywN0LJWcpixHkhPCr/wBkX8yBuyC6MuTHukWTPrkyT 9WrpgAorMf+w+e+3NpHKDBQtmkKc0Pcgs2OF+XIxTN81J5q0f95/8n2KX9DcyEXxC1oP tdhBhvc6Nbhb0dE2hauutJTeINtEco7J+AkFAFqm6dc4RcanNSBmZFBKlMqLzOlayHOC JxGFuOFg9eWS6znUyn9M0hmvPrFYXbfxKE8Fm+UdXOwQBSh0d/XRNzKnRmoiHvqvfiIH 4HHA== X-Gm-Message-State: APf1xPCUWHsDT48/u5Io+2pNJh6cbeoV34D45VZXQh8X2yNyikbJm+UF g4vKx5AgAIAUIzb5fLkGl9rKXQ== X-Google-Smtp-Source: AH8x227EoNDaSitmeZ21PvTfiG+UbXv8nak4Q/QUMjcYZyL2dARxXRxISuv+cJi5u7pY0I8uxuxP1w== X-Received: by 10.25.44.137 with SMTP id s131mr6339861lfs.18.1518858477331; Sat, 17 Feb 2018 01:07:57 -0800 (PST) Received: from localhost.localdomain ([178.71.231.54]) by smtp.gmail.com with ESMTPSA id p74sm2705310ljp.5.2018.02.17.01.07.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Feb 2018 01:07:56 -0800 (PST) From: Oleg Pykhalov To: guix-patches@gnu.org Subject: [PATCH] bash completion: Complete files names after 'guix package -m'. Date: Sat, 17 Feb 2018 12:07:38 +0300 Message-Id: <20180217090738.6812-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Oleg Pykhalov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * etc/completion/bash/guix (_guix_is_dash_L): Replace with ‘_guix_is_dash_L_or_m’. (_guix_complete): Add this. --- etc/completion/bash/guix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 6b84193db..286c4f1c5 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -97,9 +97,10 @@ _guix_is_removing () $result } -_guix_is_dash_L () +_guix_is_dash_L_or_m () { - [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \ + comp_words_minus_1="${COMP_WORDS[$COMP_CWORD - 1]}" + [ "$comp_words_minus_1" = "-L" ] || [ "$comp_words_minus_1" = "-m" ] \ || { case "${COMP_WORDS[$COMP_CWORD]}" in --load-path=*) true;; *) false;; @@ -149,7 +150,7 @@ _guix_complete () *) if _guix_is_command "package" then - if _guix_is_dash_L + if _guix_is_dash_L_or_m then _guix_complete_file elif _guix_is_removing -- 2.16.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 10:45:48 2018 Received: (at 30495) by debbugs.gnu.org; 17 Feb 2018 15:45:49 +0000 Received: from localhost ([127.0.0.1]:48459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en4gM-000715-7I for submit@debbugs.gnu.org; Sat, 17 Feb 2018 10:45:46 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en4gL-00070y-7m for 30495@debbugs.gnu.org; Sat, 17 Feb 2018 10:45:45 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BFE8120A11; Sat, 17 Feb 2018 10:45:44 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 17 Feb 2018 10:45:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=xoK9gZKVyB/g2/cERufsw49DBPqlL0Hy8BxdJnh6B+s=; b=kVAJ7U/W y2J5ZIIR3gepZeq5lZf+JGQ2RIUJ1/OHhZCLU/7pABAxaIGQHyEQgmKVJmYExSw8 ipnCv8yzh2ND+Sgy17LBmNqwQlsjwIUDfWV4xpToQqtI2Qg8g6rmIlSaogeyOYyU GAW0Lvb70UCn5KlHgOinEftu750zmu7nm2MVDGbWw3EhQ2BwdnufeJfiyAMjyWOP KEM8S7uxsFnk+onGQbP/2EDuO/HYGkPTEFuKYvvWWfsAC5YSysI/6rp6Hp/WiMnL CoM8peeGQVn9ndZsiJFsaCUBNSg9umo5MEdaHrBek81ROThf7p5kKD9mYc40006n wXMwpg0tJDEK9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=xoK9gZKVyB/g2/cERufsw49DBPqlL 0Hy8BxdJnh6B+s=; b=a64j96TkEXsax9MeW0XgPbVHheCpvuGg77eaxKJyDKGVI zQjYl7tiY8wsMKbiQeMO0EoDivHN6xG+4+Gz24ciAW32hjkLOcTNb/ysYqQt191c RDVz1tDine8S1XqhXcP5KnVWQmFq6K45iswqayCP+zdjmzBqVwkavzQAf5vvQj5O cBqzMfTVmOP+dZftkeJ/EwIhpQK9P7E4r8Ub1lOA7FnopNDIEAA1aAlnu3Ny+yNp fJ07SULBpuVFP0oFRbgBHrB4WFPzHiOLfdUGxsr70EgqGdFwWQBwkihSzIkxdoTQ LJIh5fPMbEupxG2OcgaI9JWPfXLDRZ0H8D/v6QKxQ== X-ME-Sender: Received: from localhost (ip-86-49-250-168.net.upcbroadband.cz [86.49.250.168]) by mail.messagingengine.com (Postfix) with ESMTPA id 5017F24547; Sat, 17 Feb 2018 10:45:44 -0500 (EST) From: Marius Bakke To: Oleg Pykhalov , 30495@debbugs.gnu.org Subject: Re: [bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'. In-Reply-To: <20180217090738.6812-1-go.wigust@gmail.com> References: <20180217090738.6812-1-go.wigust@gmail.com> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 17 Feb 2018 16:45:42 +0100 Message-ID: <87wozbtyah.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30495 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Oleg Pykhalov writes: > * etc/completion/bash/guix (_guix_is_dash_L): Replace with > =E2=80=98_guix_is_dash_L_or_m=E2=80=99. > (_guix_complete): Add this. [...] > diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix > index 6b84193db..286c4f1c5 100644 > --- a/etc/completion/bash/guix > +++ b/etc/completion/bash/guix > @@ -97,9 +97,10 @@ _guix_is_removing () > $result > } >=20=20 > -_guix_is_dash_L () > +_guix_is_dash_L_or_m () > { > - [ "${COMP_WORDS[$COMP_CWORD - 1]}" =3D "-L" ] \ > + comp_words_minus_1=3D"${COMP_WORDS[$COMP_CWORD - 1]}" > + [ "$comp_words_minus_1" =3D "-L" ] || [ "$comp_words_minus_1" =3D "-= m" ] \ > || { case "${COMP_WORDS[$COMP_CWORD]}" in > --load-path=3D*) true;; > *) false;; I think this fails to account for the long form "--manifest". Perhaps it's better to add a new "_guix_is_dash_m" and use "if _guix_is_dash_L || _guix_is_dash_m" below. WDYT? > @@ -149,7 +150,7 @@ _guix_complete () > *) > if _guix_is_command "package" > then > - if _guix_is_dash_L > + if _guix_is_dash_L_or_m > then > _guix_complete_file > elif _guix_is_removing > --=20 > 2.16.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqITicACgkQoqBt8qM6 VPrg4AgAq2dX3qvqznJ5nGG/O9C7PWQ+YiZS2EIRU97IhkmfOiu2lLFTDdk14FLH r7PqfWVjtJK9iav/H6LMB1dZYDYk3w9Yoce4yUtzP2XKH2sZbblFZHfjFPKpLZ1a C8N3zK73s+XZALSp5Nrd/1u7JizO+BuwdLso/QrdGKms7IJ1Ry5N6pMet/4H2frG oiBgUu7FXCnykn7WjldCDxKwBvtGUc1yxA4xtLfG18iGsgNRmgo/8Jr2utRxIV5G yBnDECF9AuxSbwCaia8bOBenRDjs/PDpWQN5I8fekhB7LlCBW0QpBBqnqVCVKz5c 4FW+t26JXqMj8dKG9cUm+zgTyFbJog== =ebm1 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 11:03:25 2018 Received: (at 30495) by debbugs.gnu.org; 17 Feb 2018 16:03:25 +0000 Received: from localhost ([127.0.0.1]:48471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en4xQ-0007TL-Up for submit@debbugs.gnu.org; Sat, 17 Feb 2018 11:03:25 -0500 Received: from mail-lf0-f49.google.com ([209.85.215.49]:36699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en4xP-0007T7-Oy for 30495@debbugs.gnu.org; Sat, 17 Feb 2018 11:03:24 -0500 Received: by mail-lf0-f49.google.com with SMTP id t79so7848132lfe.3 for <30495@debbugs.gnu.org>; Sat, 17 Feb 2018 08:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=w1OHYgFUm50OGqG4+IhBqtTAQ7YEmyaRsN9aDeB294c=; b=MwN/cpWs2zKJbS53q0hfdqArKisV6d+pMeVsQgxdgaajDPIRF55L1I4fWscUlE1GLF /2T48rKp8F4Liflo5fTGUii2eU7cXrQwPraxybTIKXKz2QnkYmYyZ0YTWADCONNkND4c aYjT5eDQw7XYYJBDhRI4jWxQj3hbLQhaPJ59xol4uxEJQ4vuPs9lClV+52M+OQLe6mjJ gPBk3tqvXHU+iLgOqsxWw0jeGPQHYt7Hj+J61maza0TYOJzciKdYICPp0RK3EGDtL0Y4 pD5njGDzDVklOohdKVtatEow0qBclBWQFaRbkWCwcXkDYF3Np36kjWYpSCnZN5khAkZG SACQ== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=w1OHYgFUm50OGqG4+IhBqtTAQ7YEmyaRsN9aDeB294c=; b=DFhPL4/W747v7FD0+lKZ2KHI7Rdd5EUoSXqg1TkkXSRF7ofQyKgn7yMmzM/s5eO5Zk 8mbY+bt8uVhnPw+DnkO0ox+EQJZ8K0+YNSgn0dWTa3+i0k3dcoWD19NyyHvNqCGtyCtz dJGPoOj43bsGAHeVElBOKwx28dzOqDz6k0BsTd6LyOxifbLcNZzjJf4L+Jb+N2s9ZuZR vV8ULnjlEP7R7PGtXhIgASnil+5S6rFH4X1EDxsZi7GbKiOLizJE5jKnkwfindDbnr9S 2lj1//7Wjy2OeFe7Z8dkfHWW1HarUCvCn2kylKXcIfYQiDFog6jnUPCn0Bnpbo3YhezB nixQ== X-Gm-Message-State: APf1xPAqOPyiglwGy/yR2uapZLY03h3c8mK3osNvHAAu0v3L4U+XkjDr N4dMOClfWouvhE2N4aJXdC91Vg== X-Google-Smtp-Source: AH8x2264TFb7ITHGqFda3+Ngvy21m0Exq2JPd2bm/qBjfTm0YSF6cyVf9+N2a6hSptPCvDgjPJ1J4w== X-Received: by 10.46.99.11 with SMTP id x11mr6747834ljb.136.1518883397222; Sat, 17 Feb 2018 08:03:17 -0800 (PST) Received: from magnolia ([178.71.230.39]) by smtp.gmail.com with ESMTPSA id 26sm2760512ljs.93.2018.02.17.08.03.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Feb 2018 08:03:16 -0800 (PST) From: Oleg Pykhalov To: Marius Bakke Subject: Re: [bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'. References: <20180217090738.6812-1-go.wigust@gmail.com> <87wozbtyah.fsf@fastmail.com> Date: Sat, 17 Feb 2018 19:03:11 +0300 In-Reply-To: <87wozbtyah.fsf@fastmail.com> (Marius Bakke's message of "Sat, 17 Feb 2018 16:45:42 +0100") Message-ID: <87wozbtxhc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30495 Cc: 30495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Oleg Pykhalov writes: > >> * etc/completion/bash/guix (_guix_is_dash_L): Replace with >> =E2=80=98_guix_is_dash_L_or_m=E2=80=99. >> (_guix_complete): Add this. > > [...] > >> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix >> index 6b84193db..286c4f1c5 100644 >> --- a/etc/completion/bash/guix >> +++ b/etc/completion/bash/guix >> @@ -97,9 +97,10 @@ _guix_is_removing () >> $result >> } >>=20=20 >> -_guix_is_dash_L () >> +_guix_is_dash_L_or_m () >> { >> - [ "${COMP_WORDS[$COMP_CWORD - 1]}" =3D "-L" ] \ >> + comp_words_minus_1=3D"${COMP_WORDS[$COMP_CWORD - 1]}" >> + [ "$comp_words_minus_1" =3D "-L" ] || [ "$comp_words_minus_1" =3D "= -m" ] \ >> || { case "${COMP_WORDS[$COMP_CWORD]}" in >> --load-path=3D*) true;; >> *) false;; > > I think this fails to account for the long form "--manifest". Perhaps > it's better to add a new "_guix_is_dash_m" and use > > "if _guix_is_dash_L || _guix_is_dash_m" > > below. WDYT? Nice catch! Thanks. But I don't know how to implement a file completion for =E2=80=98--manifest= =3D=E2=80=99. =E2=80=98--load-path=3D=E2=80=99 doesn't have a file completion too. Only = completion for equal sign before. Oleg. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-bash-completion-Complete-files-names-after-guix-pack.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] bash completion: Complete files names after 'guix package From=20b6d104ec1b3df46a409c989bf12e19c30a920c00 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 17 Feb 2018 12:05:26 +0300 Subject: [PATCH] bash completion: Complete files names after 'guix package -m'. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * etc/completion/bash/guix (_guix_is_dash_L): Replace with =E2=80=98_guix_is_dash_L_or_m=E2=80=99. (_guix_complete): Add this. =2D-- etc/completion/bash/guix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 6b84193db..70430c5c9 100644 =2D-- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -106,6 +106,15 @@ _guix_is_dash_L () esac } } =20 +_guix_is_dash_m () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" =3D "-m" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --manifest=3D*) true;; + *) false;; + esac } +} + _guix_complete_file () { # Let Readline complete file names. @@ -149,7 +158,7 @@ _guix_complete () *) if _guix_is_command "package" then =2D if _guix_is_dash_L + if _guix_is_dash_L || _guix_is_dash_m then _guix_complete_file elif _guix_is_removing =2D-=20 2.16.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAlqIUj8ACgkQckbhHGm3 lWnMbA//VwzjT2kxffXRVj9hJRwn/SStEi/lCKzzj2pIbQ8u2ZdvtY+kcz9NpiM+ 0u2q4EAzln9Nak3RU9wW8Fw+rVph6r8/xsFPJUMl2yBhayMX8XsPFLakOdPSs5P4 qbYv4jTBaWguggxDtEauoq7esNS4URn87zXpdCLL9hkUEXaz6mlMlB1hskLtvQ3M v+zo8J4PZygLIomxumkX4NGDzQYL/UbQcKrqod7iTYNfQoGGDi8Fpjxl4fZfbFzO 6ZR3gjQ4dbeaH+s28klACZywPyO3n5kq5SMVwT0sXRHn67PMRq/WMifZfWPVeKMh tMMfybnI2kFGm1jD4Y/UL+gLJYM7lT3YHSSD6xF9xWYKimtdB/BW7lpniJC6pmeS 27IgTMz59oOZtqobu3G8tXLm/FniO2B7ZZrQIRx9XdtkHTZQPusWSCvBLIrDmm1R sb+1z7TD71o4CG5Os3U/7E10PJK5xGkjTEq+M2MiYI+BYRwMA8JX+1z2un2EcJxl MbeW9LkjBzt0U7FT1WqsngDwUMaIc3SJKYuLLsGPQcM8KpJLKwJ3DOaICrpN/tOH LC4BQq3W7NFQI3ORA5msnlqMG7ltF6MhiL7cq7zIvtbVEpjiqnMq3zrxdYeAQaLO v5zH9V1rf4rzjZjaQ6xZSf3LeavV6ldcKqqy3gW0NcAdFvJA3Ss= =CFvQ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 11:14:53 2018 Received: (at 30495) by debbugs.gnu.org; 17 Feb 2018 16:14:53 +0000 Received: from localhost ([127.0.0.1]:48487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en58X-0007lj-Ic for submit@debbugs.gnu.org; Sat, 17 Feb 2018 11:14:53 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en58V-0007lb-LP for 30495@debbugs.gnu.org; Sat, 17 Feb 2018 11:14:52 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5823620A7E; Sat, 17 Feb 2018 11:14:51 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 17 Feb 2018 11:14:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=fWBx/uL+GAuzAe+QFY+UnKCwKoYIJKa1c9bCULBwTlE=; b=imJF4y0w D3m1f7thul3UlfWfm3v1Wti0LRnAGPPj7dWjUfVYpMISqOuBIOSuRfLLpt5DUkuy KT/5QIDQ4KC3YCn5LPfDrkxBUJKHMPw4G94Cl1YIKmrw55SrF0QkCCOvG58BV+4k K5BoYkSw6mMjror/wC0WM+se5E+bHKQEwdYeYwF2G2ptN04fgJm9kq6+HoAE/wdD lCfHoU4NCc/QXNOMiq36ToiljMsQTyeslzKn3FK3FQy6zyJFgeyKNbp31ZUw7XYy Uits+KtRR6yfRXTtlY8cRtcXBAsnB0ihce8G5uYthhbah2FthsukOsTjFGSAS3su wcdwL56/nZXNeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=fWBx/uL+GAuzAe+QFY+UnKCwKoYIJ Ka1c9bCULBwTlE=; b=XP07oGuEOx2VosRxLm6KArWlHWtHr0j1Etf17VjHQuHpO eQrxwYNyliYyQIdbt0bISttLfoLIoBYvIhniTtLSmArPcuC2IATKJ9VJXmynySwZ 0vjelbOQrQjXnH0ULT4lIjdn66QmgoYDfhwH9lSZnyVmKU7NfBHyufRAWOCYBD/7 UgKcLcC3inSq+8GHpAmt/cXWtLS9AMhtT2d6e78743viMLo8a8pCNaezz8nZ5ygo NeUpBAdQymUyaHGXwoCyxQ6Rr+vSbcQ2sX27ooGWju6G6bmFf5jSmsCeyttIttS5 YoUE2Uk2GvI9oHMAqzESvdmnDBYn7x/UUzSwjkieg== X-ME-Sender: Received: from localhost (ip-86-49-250-168.net.upcbroadband.cz [86.49.250.168]) by mail.messagingengine.com (Postfix) with ESMTPA id E9704246D0; Sat, 17 Feb 2018 11:14:50 -0500 (EST) From: Marius Bakke To: Oleg Pykhalov Subject: Re: [bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'. In-Reply-To: <87wozbtxhc.fsf@gmail.com> References: <20180217090738.6812-1-go.wigust@gmail.com> <87wozbtyah.fsf@fastmail.com> <87wozbtxhc.fsf@gmail.com> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 17 Feb 2018 17:14:48 +0100 Message-ID: <87tvuftwxz.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30495 Cc: 30495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Oleg Pykhalov writes: > Marius Bakke writes: > >> Oleg Pykhalov writes: >> >>> * etc/completion/bash/guix (_guix_is_dash_L): Replace with >>> =E2=80=98_guix_is_dash_L_or_m=E2=80=99. >>> (_guix_complete): Add this. >> >> [...] >> >>> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix >>> index 6b84193db..286c4f1c5 100644 >>> --- a/etc/completion/bash/guix >>> +++ b/etc/completion/bash/guix >>> @@ -97,9 +97,10 @@ _guix_is_removing () >>> $result >>> } >>>=20=20 >>> -_guix_is_dash_L () >>> +_guix_is_dash_L_or_m () >>> { >>> - [ "${COMP_WORDS[$COMP_CWORD - 1]}" =3D "-L" ] \ >>> + comp_words_minus_1=3D"${COMP_WORDS[$COMP_CWORD - 1]}" >>> + [ "$comp_words_minus_1" =3D "-L" ] || [ "$comp_words_minus_1" =3D = "-m" ] \ >>> || { case "${COMP_WORDS[$COMP_CWORD]}" in >>> --load-path=3D*) true;; >>> *) false;; >> >> I think this fails to account for the long form "--manifest". Perhaps >> it's better to add a new "_guix_is_dash_m" and use >> >> "if _guix_is_dash_L || _guix_is_dash_m" >> >> below. WDYT? > > Nice catch! Thanks. > > But I don't know how to implement a file completion for =E2=80=98--manife= st=3D=E2=80=99. > =E2=80=98--load-path=3D=E2=80=99 doesn't have a file completion too. Onl= y completion for > equal sign before. Oh, OK. That's another issue I guess. The patch below LGTM, but the commit message needs adjusting ;-) Thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqIVPkACgkQoqBt8qM6 VPohmQf/YkA3GWRBjv+OGK4f77lIV7/5zWDqtrBltA73tKkCbpOS3zr34JCPF0Cs 9LuscYgL5kwpQgqwtupvvEoQdXHrUgdgRYZRgrp1NhKt+k0c53f9VntwoTn/lrID C/VLTYbZrh480OBtJxVL1v2K+xowDGprQh7bbEF18SgVhrXximmYkD1QVxKyAghC +02FQ0mSay+hzq2wukbgDBzjBxsDMcgSt6Fx3aYUN8T19iz/4Cmj+Nz+T7SsmBnG 3WSmIpqy/xBQvnB6tFU3miujlRWAD50mjuUIyu6I+p32HpmjZQjaJZwXT8pFpB/U 4RpR+SeqaflSYhNOA+sTBkjVEPQUkQ== =0tHR -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 14:25:23 2018 Received: (at 30495) by debbugs.gnu.org; 17 Feb 2018 19:25:24 +0000 Received: from localhost ([127.0.0.1]:48642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en86t-0004I0-Kz for submit@debbugs.gnu.org; Sat, 17 Feb 2018 14:25:23 -0500 Received: from mail-lf0-f50.google.com ([209.85.215.50]:33601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1en86s-0004Hi-H6; Sat, 17 Feb 2018 14:25:22 -0500 Received: by mail-lf0-f50.google.com with SMTP id j193so8234261lfe.0; Sat, 17 Feb 2018 11:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=vxlvYRH1SFKwhlbfoObsuqnMgURRTrdj0L0FcNLS8qc=; b=ZbRjoL+DNci5GR2wTeYNCCRNmIHj1d4FZMmxjXFzIvydzntwdELSXZOduE0bQ/cmz+ SGY4ScTGnaBBpvElG+9navf3UDBHxmMffk0ciuObyGHj+t5BQb0xOJfJJzYm4gDrswvX jhHZK+0j7N9fJl5TtoJXNGq8ViyoaJTBVdrnyIdfNjjVtpmacBkSDOfilFgHXR+aSMNf K0wVyaD5wr2YrgTQ9LlcLONm9FxvkbivNC8v2vC65Lgrem1DIdeX40hF/10Xr/HS+9bh /plb457mDzriWsHZgjwV2bXSdSxU5HCZRlWd1SkEGCJ383wN+XMSBl8yqJHzgN5l5jDQ Me0g== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=vxlvYRH1SFKwhlbfoObsuqnMgURRTrdj0L0FcNLS8qc=; b=dlvADhe++9fefWKa2OuTnNvE3wWrZIfGmZn3v3NKzUPyOI9ad0TqSaqshR95tFf1bq 4JKvyLt+Lrx3gsCnKLQUsMAcVxSJlqDfJglbaJMM3wZ/qrJgwllS+M2CKlcFwyEw979g n90SJ/ujBzmPLz/yxY1myKr+cR2cffahyQicrgBoTOzYHPfafp8yWZBOKWkovipiVJWJ O84wSves6YvXL87vIsLOdOfmEfrc6N8o8/ti+XEW5O/P7vFWa8g9P7QdboTwxElDgOHj 31O5NByqiHxJlhBBmjL6I/o1KI4wLV5vuO2K4uPF5Gr54/T+oIiSgwj8NbrcFyGYTW26 8BcA== X-Gm-Message-State: APf1xPAPA7LWPTZMaS6wwxkxiXICAGehgKV9Ddc7MUEYyqh65X1cb8yn iv1uxxg/xIy3BPa/o0jNVfL1mA== X-Google-Smtp-Source: AH8x227XZWiJq75PbavRvXZ49gz1sxwePn999e4X/SrodwdzEQxAuZivLglUEIH+OFyhONAlPAZQLw== X-Received: by 10.25.239.10 with SMTP id n10mr6391315lfh.8.1518895516270; Sat, 17 Feb 2018 11:25:16 -0800 (PST) Received: from magnolia ([178.71.230.39]) by smtp.gmail.com with ESMTPSA id k184sm4253183lfg.72.2018.02.17.11.25.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Feb 2018 11:25:15 -0800 (PST) From: Oleg Pykhalov To: Marius Bakke Subject: Re: [bug#30495] [PATCH] bash completion: Complete files names after 'guix package -m'. References: <20180217090738.6812-1-go.wigust@gmail.com> <87wozbtyah.fsf@fastmail.com> <87wozbtxhc.fsf@gmail.com> <87tvuftwxz.fsf@fastmail.com> Date: Sat, 17 Feb 2018 22:25:11 +0300 In-Reply-To: <87tvuftwxz.fsf@fastmail.com> (Marius Bakke's message of "Sat, 17 Feb 2018 17:14:48 +0100") Message-ID: <87o9knto4o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30495 Cc: 30495-done@debbugs.gnu.org, 30495@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Oleg Pykhalov writes: > >> Marius Bakke writes: >> >>> Oleg Pykhalov writes: >>> >>>> * etc/completion/bash/guix (_guix_is_dash_L): Replace with >>>> =E2=80=98_guix_is_dash_L_or_m=E2=80=99. >>>> (_guix_complete): Add this. >>> >>> [...] >>> >>>> diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix >>>> index 6b84193db..286c4f1c5 100644 >>>> --- a/etc/completion/bash/guix >>>> +++ b/etc/completion/bash/guix >>>> @@ -97,9 +97,10 @@ _guix_is_removing () >>>> $result >>>> } >>>>=20=20 >>>> -_guix_is_dash_L () >>>> +_guix_is_dash_L_or_m () >>>> { >>>> - [ "${COMP_WORDS[$COMP_CWORD - 1]}" =3D "-L" ] \ >>>> + comp_words_minus_1=3D"${COMP_WORDS[$COMP_CWORD - 1]}" >>>> + [ "$comp_words_minus_1" =3D "-L" ] || [ "$comp_words_minus_1" =3D= "-m" ] \ >>>> || { case "${COMP_WORDS[$COMP_CWORD]}" in >>>> --load-path=3D*) true;; >>>> *) false;; >>> >>> I think this fails to account for the long form "--manifest". Perhaps >>> it's better to add a new "_guix_is_dash_m" and use >>> >>> "if _guix_is_dash_L || _guix_is_dash_m" >>> >>> below. WDYT? >> >> Nice catch! Thanks. >> >> But I don't know how to implement a file completion for =E2=80=98--manif= est=3D=E2=80=99. >> =E2=80=98--load-path=3D=E2=80=99 doesn't have a file completion too. On= ly completion for >> equal sign before. > > Oh, OK. That's another issue I guess. The patch below LGTM, but the > commit message needs adjusting ;-) Ouch, thank you for reminding. Pushed as f5f916792c7069a22d95c5b7c68bcf3bbb86e451 I'll close the bug report. Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAlqIgZcACgkQckbhHGm3 lWkPdBAAhZUrVx8Lzk+YN24nHt/XUyx4vVsIpsxM8husADiXLw13EYJnTPV4nxLs jCgXIjVWtjQ8xiFjVraqqvnAv4Re/cnrZv/1xrGX+a882zAbLUc2K38fqT63f+6y I+yYXTR18mQVqM9ZoIGj7qDGsaF9cwImvoN8pU/yBO+bjxgEZqxefJRyqoTe7fwa ftNbGCmQH70rHLfxhxPsmqpR4FInYcg+56+QGhlr3RTyhAoIMaRTxJh88aUYl0ac Vmb8tDNcjfSBe9jxaZKd75R6NvhaaGCU5U2+Ce9K930fncMtkBzPnRQneyuhPwkm GBV7GyVHSRGESgpHzfshRlvV8zets+/NQDrf1hwLrQ+kb0b+ExvCU+JswNKV+Ubw wo6eZgUq9JIIIaS2HTELUE4pEoNOYY/y10uTu/oVHB3q0smE1z01JYM66uS/4Ghj K+3HbvASfvOvYnns7MqzfNZ/lMGr8sqaUoBbfiHrVWzb+NnadgDFbexAKWsAzh9t WRGEhYHNvcljBJN/ojDstnFSsRLkV2lZj3TSKAshVvdX3tO/iokqL9swakeW33/5 xnJ6mDaqNdNAhPRJIVVEvNfDEtlAcLyic5HmHg+eHFYlbUsG1CgtV+Auv6ecemhA JbbfCF2rU6ms0VmCfaSa5mXO9VutMcwvl0QfKx59cbxNKb/Ag+Q= =P0yQ -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 23 07:48:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 18 Mar 2018 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator