From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 370931FC9B for ; Sat, 6 Feb 2021 12:18:46 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 16/17] lei_curl: replace -K/--config with --curl-config Date: Sat, 6 Feb 2021 12:18:43 +0000 Message-Id: <20210206121844.10979-17-e@80x24.org> In-Reply-To: <20210206121844.10979-1-e@80x24.org> References: <20210206121844.10979-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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. --- lib/PublicInbox/LeiCurl.pm | 7 +++++++ lib/PublicInbox/LeiQuery.pm | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/LeiCurl.pm b/lib/PublicInbox/LeiCurl.pm index c8747d4f..38b17c78 100644 --- 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 7c856032..63945d53 100644 --- 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