lei_curl: replace -K/--config with --curl-config

Seeing --config in the command-line for lei may mislead users
into thinking we support config file overrides that way.  Rename
the option to --curl-config and drop the short switch for now.

diff --git a/lib/PublicInbox/LeiCurl.pm b/lib/PublicInbox/LeiCurl.pm
index c8747d4f0c07f2040efd6e882ab9ebc931ebff5e..38b17c7859565e6e0e9ded1b50d835a7e0150536 100644 (file)
--- a/lib/PublicInbox/LeiCurl.pm
+++ b/lib/PublicInbox/LeiCurl.pm
@@ -8,6 +8,10 @@ use v5.10.1;
 use PublicInbox::Spawn qw(which);
 use PublicInbox::Config;
 
+my %lei2curl = (
+       'curl-config=s@' => 'config|K=s@',
+);
+
 # prepares a common command for curl(1) based on $lei command
 sub new {
        my ($cls, $lei, $curl) = @_;
@@ -17,6 +21,9 @@ sub new {
        $cmd[-1] .= 's' if $opt->{quiet}; # already the default for "lei q"
        $cmd[-1] .= 'v' if $opt->{verbose}; # we use ourselves, too
        for my $o ($lei->curl_opt) {
+               if (my $lei_spec = $lei2curl{$o}) {
+                       $o = $lei_spec;
+               }
                $o =~ s/\|[a-z0-9]\b//i; # remove single char short option
                if ($o =~ s/=[is]@\z//) {
                        my $ary = $opt->{$o} or next;

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 7c8560327ef9fcd03d5be58a6c71861ffc794308..63945d5316ee42b265552e41dc6332c705a39221 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -155,9 +155,12 @@ sub _complete_q {
 # TODO: should we depend on "-c http.*" options for things which have
 # analogues in git(1)? that would reduce likelyhood of conflicts with
 # our other CLI options
+# Note: some names are renamed to avoid potential conflicts,
+# see %lei2mail in lib/PublicInbox/LeiCurl.pm
 sub curl_opt { qw(
+       curl-config=s@
        abstract-unix-socket=s anyauth basic cacert=s capath=s
-       cert-status cert-type cert=s ciphers=s config|K=s@
+       cert-status cert-type cert=s ciphers=s
        connect-timeout=s connect-to=s cookie-jar=s cookie=s crlfile=s
        digest disable dns-interface=s dns-ipv4-addr=s dns-ipv6-addr=s
        dns-servers=s doh-url=s egd-file=s engine=s false-start