From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23202 invoked from network); 29 Mar 2021 15:07:08 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 29 Mar 2021 15:07:08 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1617030429; b=ck/us4poVi/MIllgr4DQNqQTG00OqdvjG6oACKkXL/T74DlouQj4Bxawr8xc0eioZRnq17N2UL sMmLx2fsyK3sxsJ2BD53x7EqHPHgtZn9Yr4+1zlwlXqg/Ob/7MCCV0kkvw2knnIDDm154ODqKl ibjrpXi6nup6LsZB3up6SMRQ3zBZmjP4aZ3vwIMjz0aRNm/wWBUzYfyxhMi3ZHB1WXegi5gQCy rTTEIyCb28P39mEWrPDRBw3dJ7Mv55mMsfY2t2m6M3OPTeDcAYWtgS9ePHPSLD0Kmx5AUR9CS7 BbhBgMxVgKk9AY2BZpmaxDAFxjT60Wa5hD84EndPSs0l0w==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out2-smtp.messagingengine.com) smtp.remote-ip=66.111.4.26; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1617030429; bh=WHpoltJ7eXnRUWCToLGWMGGOurN04AB3lr+zqzoV6E0=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version: Message-ID:Subject:To:From:Date:DKIM-Signature:DKIM-Signature: DKIM-Signature; b=c7vEZ8ItJoPQPLXhXIGdE2Oa8kMLd/tMHshhSXpd3OlGnd+KqFlBmAXGvV430MM09QC6UtcKp4 K7/I14n0RsAM8WeFOlIp1pYIqwoQRsVC1yZMDtXqP+hW6Dn1L0xRazRSVotSRB88R9rquixpWe HmtjsAHEvaNHj5coWnD7c08uezMNoqFknWBO0LBWYC/74+37ZoeA0lKO8VK4AVT8upPU1M2qt1 9ZX9g++kacfop1qpK4Wod/KAfhXRRgrmQcqFOK8Hfn0dWIF5hQcoH141GYQ8tmm2Yy1SodgSc5 l/+YgNUhIfFsurMNvlaW/kGM3eHUukh9x/vzVPrhjugFgQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Subject:To:From:Date:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=LBm1VxnHIGMCPksJ6GCwTVTi7egd51BbmN1RAovwucw=; b=F3fPq1YAuMFVvPYgTr2ruB6Mop 8+QsA8jOa9WzOlDHT1Zu5RQ6D5+AXefUHcRvvTyMQQBg/9o0C2cHC7Y4k5BoocsKVRRF4i5vD/9Yd FKcImgyV5Z2y/+i3yssqLVq6ApL69zmn6YgGYSLJlSHI4DjDc4u7SZHNLrCXCY6dNWTJH3ZRbhxqL FLK0FszjHqnVVi8yR3kDhpzfKY3doCQmDFxNcpeK9DDlo3wUvTk8m9LuE+adUtQkXV/NK91D4c7Ix G0xhba5as9qEabXEsm2NsafZxnqgX4OwLX8Uq1oXZigeWa1i4xkCrX/4zsCoollv5LS54AzjXqivF 4hGpYF6Q==; Received: from authenticated user by zero.zsh.org with local id 1lQtTw-0004I3-5y; Mon, 29 Mar 2021 15:07:08 +0000 Authentication-Results: zsh.org; iprev=pass (out2-smtp.messagingengine.com) smtp.remote-ip=66.111.4.26; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53059) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1lQtTc-000490-Le; Mon, 29 Mar 2021 15:06:51 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 4A9B85C00F4; Mon, 29 Mar 2021 11:06:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 29 Mar 2021 11:06:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:to:subject:message-id :mime-version:content-type:content-transfer-encoding; s=fm3; bh= LBm1VxnHIGMCPksJ6GCwTVTi7egd51BbmN1RAovwucw=; b=kOSBR6LVcRmpEoWV rS6qA1n7cr5ojYUZgibR0YbKxw69CPHvFNjsyZCcmpgJm8U+wbsAydikG89VfwV1 uLEZJjzI2Uby0wwtjQoAl/X3jFauAZjMaI4WrdUd4PEDQYES6BoH1OJDwKfzuQ9K 1Adhotpbd9kmBwaRA/fyBojnSrlBD6aWmP9jxbsnYgpn3J+Fnq9T5wSCy06eht23 sQi4A7QWfm2qLe/szAhD6Lu0VhHU1mvHH4md8qcfOMgNjWQyUoTowvep+/mdufbD kSHT+Vi9jsdyWTIK2a+rwRhCCH8suicM7Lz7UA7bVtttYvBjgmTeOtjuuwAPG6zV lxH09g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=LBm1Vx nHIGMCPksJ6GCwTVTi7egd51BbmN1RAovwucw=; b=AqvyqBg0jMAEqw4m9huI+e r/bZcuO2l7UjAszNjeUW2jqtMRb2bP4atxw4AXyaeDw8bR1chWe8xsCA5BD/L1sm oEla7uI7FsjrpAyJwuAEB+HyBKa/QnCauw9G07XUWneDC7QsWREvxgsI7ZubNGT+ 2iB0rBCZy8GgQbucLu3sjBRkGVjG1OwRYU3nfPgBM5QksH1KACP5TtSuSq86URd4 MYSQOGVxo2QSmXydJMVJ7aIp2rcqb2bVdIvGX8A74IQIzE5cnImW2ERd5BPP9bZB nCY9JOtRHqX8rGEpDf2dJbH/3XDouT/Sm8PisE0FSRQDljDv82mvAk0Qm1890Duw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudehkedgkeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtugfgfgesthektd dttderjeenucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurdhssegurghnihgv lhdrshhhrghhrghfrdhnrghmvgeqnecuggftrfgrthhtvghrnhepvdfhjeetueefgfegve ejffdtveeukeehjeetkeevueevvedufeeltdeiudeihedtnecukfhppeejledrudekvddr feeirddukedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepugdrshesuggrnhhivghlrdhshhgrhhgrfhdrnhgrmhgv X-ME-Proxy: Received: from tarpaulin.shahaf.local2 (bzq-79-182-36-181.red.bezeqint.net [79.182.36.181]) by mail.messagingengine.com (Postfix) with ESMTPA id C5C601080063 for ; Mon, 29 Mar 2021 11:06:46 -0400 (EDT) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4F8GBX1LrRz44r; Mon, 29 Mar 2021 15:06:44 +0000 (UTC) Date: Mon, 29 Mar 2021 15:06:44 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: PATCH: _perl_modules assumes it's called by perl Message-ID: <20210329150644.GA30806@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.10.1 (2018-07-13) X-Seq: 48321 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Archived-At: A couple of issues in _perl_modules. 1. The condition «[[ ${+perl} -eq 1 ]]» will always be true. 2. If called by some command other than perl, it will invoke that command as «$foo -e 'print "@INC"'», assuming it to be a perl. For instance: . % compdef _perl_modules git % git unknown option: -e ⋮ How about the following? — diff --git a/Completion/Unix/Type/_perl_modules b/Completion/Unix/Type/_perl_modules index d27a7f7af..02b43366a 100644 --- a/Completion/Unix/Type/_perl_modules +++ b/Completion/Unix/Type/_perl_modules @@ -60,10 +60,11 @@ _perl_modules () { with_pod=_with_pod fi - local perl=${words[1]%doc} perl_modules - if whence $perl >/dev/null; then + local perl perl_modules + if [[ $service == (perl|perldoc) ]]; then + perl=${${(Q)words[1]}%doc} perl_modules=_${${perl//[^[:alnum:]]/_}#_}_modules$with_pod - elif (( ${+commands[perl]} )); then + elif whence perl > /dev/null; then perl=perl perl_modules=_perl_modules$with_pod else @@ -81,8 +82,8 @@ _perl_modules () { else local inc libdir new_pms - if [[ ${+perl} -eq 1 ]]; then - inc=( $( $perl -e 'print "@INC"' ) ) + if [[ -n $perl ]]; then + inc=( $( _call_program perl-inc ${(q)perl}$' -e \'print "@INC"\'' ) ) else # If perl isn't there, one wonders why the user's trying to # complete Perl modules. Maybe her $path is wrong?