X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwText.pm;h=cbe82b730f765a585e3fbf019a98f5183afa3405;hb=089380f8ebecbe868c5599773b3c23d40b3db129;hp=ace7f9d73231d0c22388f94f02c757ccd9d12d25;hpb=75a15dbb79d4e508fc868e82cb074776830b80d6;p=public-inbox.git diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm index ace7f9d7..cbe82b73 100644 --- a/lib/PublicInbox/WwwText.pm +++ b/lib/PublicInbox/WwwText.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 all contributors +# Copyright (C) 2016-2020 all contributors # License: AGPL-3.0+ # used for displaying help texts and other non-mail content @@ -147,6 +147,8 @@ sub inbox_config ($$$) { ; note: public-inbox before v1.2.0 used "mainrepo" ; instead of "inboxdir", both remain supported after 1.2 mainrepo = /path/to/top-level-inbox + url = https://example.com/$name/ + url = http://example.onion/$name/ EOS for my $k (qw(address listid infourl)) { defined(my $v = $ibx->{$k}) or next; @@ -166,17 +168,21 @@ EOS my $pi_config = $ctx->{www}->{pi_config}; for my $cr_name (@$cr) { - my $url = $pi_config->{"coderepo.$cr_name.cgiturl"}; + my $urls = $pi_config->{"coderepo.$cr_name.cgiturl"}; my $path = "/path/to/$cr_name"; $cr_name = dq_escape($cr_name); $$txt .= qq([coderepo "$cr_name"]\n); - if (defined($url)) { - my $cpath = $path; - if ($path !~ m![a-z0-9_/\.\-]!i) { - $cpath = dq_escape($cpath); - } - $$txt .= qq(\t; git clone $url "$cpath"\n); + if ($urls && scalar(@$urls)) { + $$txt .= "\t; "; + $$txt .= join(" ||\n\t;\t", map {; + my $cpath = $path; + if ($path !~ m![a-z0-9_/\.\-]!i) { + $cpath = dq_escape($cpath); + } + qq(git clone $_ "$cpath"); + } @$urls); + $$txt .= "\n"; } $$txt .= "\tdir = $path\n"; $$txt .= "\tcgiturl = https://example.com/"; @@ -250,6 +256,11 @@ EOF $QP_URL +EOF + } # $srch + my $over = $ibx->over; + if ($over) { + $$txt .= <