On ven, mag 22, 2015 at 05:39:38 +0200, Daniel Stenberg wrote: > On Fri, 8 May 2015, Alessandro Ghedini wrote: > > >>I'm all for that. I would prefer to not have the new script in the root > >>dir though... > > > >What about a scripts/ subdirectory? Some of the existing scripts could be > >moved there too (e.g. contri*.sh, log2changes.pl). > > Sounds perfect in my ears!
Ok, see attached patch (I've also added it to EXTRA_DIST in Makefile.am). I haven't touched any other scripts yet though since it may break other stuff (e.g. log2changes.pl seems to be used by maketgz, which is in turn referenced in the documentation, so that will need updating as well). Cheers
From 6b311da654f70d07acdcb2c78733535f72741596 Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini <[email protected]> Date: Thu, 7 May 2015 16:07:24 +0200 Subject: [PATCH] add script for generating zsh completion --- Makefile.am | 2 +- scripts/zsh.pl | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100755 scripts/zsh.pl diff --git a/Makefile.am b/Makefile.am index 60d744e..22823d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,7 +118,7 @@ WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \ winbuild/Makefile.msvc.names EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ + RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl \ $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ diff --git a/scripts/zsh.pl b/scripts/zsh.pl new file mode 100755 index 0000000..7520a15 --- /dev/null +++ b/scripts/zsh.pl @@ -0,0 +1,77 @@ +#!/usr/bin/perl + +# Generate ZSH completion + +use strict; +use warnings; + +my $curl = $ARGV[0] || 'curl'; + +my $regex = '\s+(?:(-[^\s]+),\s)?(--[^\s]+)\s([^\s.]+)?\s+(.*)'; +my @opts = parse_main_opts('--help', $regex); + +my $opts_str; + +$opts_str .= qq{ $_ \\\n} foreach (@opts); +chomp $opts_str; + +my $tmpl = <<"EOS"; +#compdef curl + +# curl zsh completion + +local curcontext="\$curcontext" state state_descr line +typeset -A opt_args + +local rc=1 + +_arguments -C -S \\ +$opts_str + '*:URL:_urls' && rc=0 + +return rc +EOS + +print $tmpl; + +sub parse_main_opts { + my ($cmd, $regex) = @_; + + my @list; + my @lines = split /\n/, `"$curl" $cmd`; + + foreach my $line (@lines) { + my ($short, $long, $arg, $desc) = ($line =~ /^$regex/) or next; + + my $option = ''; + + $desc =~ s/'/''/g if defined $desc; + $desc =~ s/\[/\\\[/g if defined $desc; + $desc =~ s/\]/\\\]/g if defined $desc; + + $option .= '{' . trim($short) . ',' if defined $short; + $option .= trim($long) if defined $long; + $option .= '}' if defined $short; + $option .= '\'[' . trim($desc) . ']\'' if defined $desc; + + $option .= ":$arg" if defined $arg; + + $option .= ':_files' + if defined $arg and ($arg eq 'FILE' || $arg eq 'DIR'); + + push @list, $option; + } + + # Sort longest first, because zsh won't complete an option listed + # after one that's a prefix of it. + @list = sort { + $a =~ /([^=]*)/; my $ma = $1; + $b =~ /([^=]*)/; my $mb = $1; + + length($mb) <=> length($ma) + } @list; + + return @list; +} + +sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s }; -- 2.1.4
signature.asc
Description: Digital signature
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
