diff options
| author | Kamil Dudka <kdudka@redhat.com> | 2017-08-14 16:13:32 +0200 |
|---|---|---|
| committer | Kamil Dudka <kdudka@redhat.com> | 2017-08-15 12:25:46 +0200 |
| commit | ab2a7079cd2a1ec279b1e6b587ba48e50c155e91 (patch) | |
| tree | dacfda2dcdeb1c8d2a8d00d3388307d4e202b55e | |
| parent | 9bd2248f92046906d5f0e147c2ab43b7903759bf (diff) | |
zsh.pl: produce a working completion script again
Commit curl-7_54_0-118-g8b2f22e changed the output format of curl --help
to use <file> and <dir> instead of FILE and DIR, which caused zsh.pl to
produce a broken completion script:
% curl --<TAB>
_curl:10: no such file or directory: seconds
Closes #1779
| -rw-r--r-- | docs/cmdline-opts/cacert.d | 2 | ||||
| -rwxr-xr-x | scripts/zsh.pl | 5 | ||||
| -rw-r--r-- | src/tool_help.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/cmdline-opts/cacert.d b/docs/cmdline-opts/cacert.d index 04e113980..b2ecf9088 100644 --- a/docs/cmdline-opts/cacert.d +++ b/docs/cmdline-opts/cacert.d @@ -1,5 +1,5 @@ Long: cacert -Arg: <CA certificate> +Arg: <file> Help: CA certificate to verify peer against Protocols: TLS --- diff --git a/scripts/zsh.pl b/scripts/zsh.pl index f0d8c195f..82b4d9fa2 100755 --- a/scripts/zsh.pl +++ b/scripts/zsh.pl @@ -54,10 +54,11 @@ sub parse_main_opts { $option .= '}' if defined $short; $option .= '\'[' . trim($desc) . ']\'' if defined $desc; - $option .= ":$arg" if defined $arg; + $option .= ":'$arg'" if defined $arg; $option .= ':_files' - if defined $arg and ($arg eq 'FILE' || $arg eq 'DIR'); + if defined $arg and ($arg eq '<file>' || $arg eq '<filename>' + || $arg eq '<dir>'); push @list, $option; } diff --git a/src/tool_help.c b/src/tool_help.c index 42dc77959..a5bfaba24 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -54,7 +54,7 @@ static const struct helptxt helptext[] = { "Append to target file when uploading"}, {" --basic", "Use HTTP Basic Authentication"}, - {" --cacert <CA certificate>", + {" --cacert <file>", "CA certificate to verify peer against"}, {" --capath <dir>", "CA directory to verify peer against"}, |