Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: _perl_modules assumes it's called by perl
- X-seq: zsh-workers 48321
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: PATCH: _perl_modules assumes it's called by perl
- Date: Mon, 29 Mar 2021 15:06:44 +0000
- Archived-at: <https://zsh.org/workers/48321>
- Archived-at: <http://www.zsh.org/sympa/arcsearch_id/zsh-workers/2021-03/20210329150644.GA30806%40tarpaulin.shahaf.local2>
- List-id: <zsh-workers.zsh.org>
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 <TAB>
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?
Messages sorted by:
Reverse Date,
Date,
Thread,
Author