* PATCH: doas completion
@ 2016-09-30 7:06 Oliver Kiddle
2016-10-01 14:31 ` Matthew Martin
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Kiddle @ 2016-09-30 7:06 UTC (permalink / raw)
To: Zsh workers
Much of this is just cut and paste from _sudo.
I think the -a option might be OpenBSD specific: once things settle down
with a single portable doas implementation instead of the current state
of there being several then that can be cleaned up.
Oliver
diff --git a/Completion/Unix/Command/_doas b/Completion/Unix/Command/_doas
new file mode 100644
index 0000000..5c26b1d
--- /dev/null
+++ b/Completion/Unix/Command/_doas
@@ -0,0 +1,18 @@
+#compdef doas
+
+local environ e cmd
+
+zstyle -a ":completion:${curcontext}:" environ environ
+
+for e in "${environ[@]}"
+do local -x "$e"
+done
+
+cmd="$words[1]"
+_arguments -s -S \
+ '(-n -s)-C+[check config file and report on command matching]:config:_files' \
+ '(-C)-n[non-interactive: fail rather than prompt for a password]' \
+ '-a+[specify authentication style]:authentication style' \
+ '(-C)-s[run a shell]' \
+ '-u+[run command as specified user]:user:_users' \
+ '*::arguments:{ _comp_priv_prefix=( $cmd -n ${(kv)opt_args[-u]} ) ; _normal }'
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PATCH: doas completion
2016-09-30 7:06 PATCH: doas completion Oliver Kiddle
@ 2016-10-01 14:31 ` Matthew Martin
2016-10-01 14:34 ` Matthew Martin
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Martin @ 2016-10-01 14:31 UTC (permalink / raw)
To: zsh-workers
On Fri, Sep 30, 2016 at 09:06:30AM +0200, Oliver Kiddle wrote:
> Much of this is just cut and paste from _sudo.
> I think the -a option might be OpenBSD specific: once things settle down
> with a single portable doas implementation instead of the current state
> of there being several then that can be cleaned up.
>
> Oliver
>
> diff --git a/Completion/Unix/Command/_doas b/Completion/Unix/Command/_doas
> new file mode 100644
> index 0000000..5c26b1d
> --- /dev/null
> +++ b/Completion/Unix/Command/_doas
> @@ -0,0 +1,18 @@
> +#compdef doas
> +
> +local environ e cmd
> +
> +zstyle -a ":completion:${curcontext}:" environ environ
> +
> +for e in "${environ[@]}"
> +do local -x "$e"
> +done
> +
> +cmd="$words[1]"
> +_arguments -s -S \
> + '(-n -s)-C+[check config file and report on command matching]:config:_files' \
> + '(-C)-n[non-interactive: fail rather than prompt for a password]' \
> + '-a+[specify authentication style]:authentication style' \
> + '(-C)-s[run a shell]' \
> + '-u+[run command as specified user]:user:_users' \
> + '*::arguments:{ _comp_priv_prefix=( $cmd -n ${(kv)opt_args[-u]} ) ; _normal }'
I've had an alternate version sitting in my tree for a while. Merging
the two I get the below. Changes are adding -A '-*' to _arguments,
adding the -L option, sorting options, and ignoring * with -s. I had it
in BSD, but I suppose it's been ported elsewhere now.
- Matthew Martin
diff --git a/Completion/BSD/Command/_doas b/Completion/BSD/Command/_doas
new file mode 100644
index 0000000..b36388e
--- /dev/null
+++ b/Completion/Unix/Command/_doas
@@ -0,0 +1,21 @@
+#compdef doas
+
+local environ e cmd
+
+zstyle -a ":completion:${curcontext}:" environ environ
+
+for e in "${environ[@]}"
+do local -x "$e"
+done
+
+cmd="$words[1]"
+_arguments -s -S -A '-*' : \
+ - optL \
+ '-L[clear any persisted authorizations]' \
+ - default \
+ '-a+[specify authentication style]:authentication style' \
+ '(-n -s)-C+[check config file and report on command matching]:config:_files' \
+ '(-C)-n[non-interactive: fail rather than prompt for a password]' \
+ '(-C *)-s[run a shell]' \
+ '-u+[run command as specified user]:user:_users' \
+ '*::arguments:{ _comp_priv_prefix=( $cmd -n ${(kv)opt_args[-u]} ) ; _normal }'
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PATCH: doas completion
2016-10-01 14:31 ` Matthew Martin
@ 2016-10-01 14:34 ` Matthew Martin
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Martin @ 2016-10-01 14:34 UTC (permalink / raw)
To: zsh-workers
On Sat, Oct 01, 2016 at 09:31:06AM -0500, Matthew Martin wrote:
> On Fri, Sep 30, 2016 at 09:06:30AM +0200, Oliver Kiddle wrote:
> > Much of this is just cut and paste from _sudo.
> > I think the -a option might be OpenBSD specific: once things settle down
> > with a single portable doas implementation instead of the current state
> > of there being several then that can be cleaned up.
> >
> > Oliver
>
> I've had an alternate version sitting in my tree for a while. Merging
> the two I get the below. Changes are adding -A '-*' to _arguments,
> adding the -L option, sorting options, and ignoring * with -s. I had it
> in BSD, but I suppose it's been ported elsewhere now.
>
> - Matthew Martin
Should have pulled first. Diff on top of master.
- Matthew Martin
diff --git a/Completion/Unix/Command/_doas b/Completion/Unix/Command/_doas
index 5c26b1d..b36388e 100644
--- a/Completion/Unix/Command/_doas
+++ b/Completion/Unix/Command/_doas
@@ -9,10 +9,13 @@ do local -x "$e"
done
cmd="$words[1]"
-_arguments -s -S \
+_arguments -s -S -A '-*' : \
+ - optL \
+ '-L[clear any persisted authorizations]' \
+ - default \
+ '-a+[specify authentication style]:authentication style' \
'(-n -s)-C+[check config file and report on command matching]:config:_files' \
'(-C)-n[non-interactive: fail rather than prompt for a password]' \
- '-a+[specify authentication style]:authentication style' \
- '(-C)-s[run a shell]' \
+ '(-C *)-s[run a shell]' \
'-u+[run command as specified user]:user:_users' \
'*::arguments:{ _comp_priv_prefix=( $cmd -n ${(kv)opt_args[-u]} ) ; _normal }'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-01 14:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-30 7:06 PATCH: doas completion Oliver Kiddle
2016-10-01 14:31 ` Matthew Martin
2016-10-01 14:34 ` Matthew Martin
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).