X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-clone;h=54059d036f8675cb89636a93e0440c9b84b87c86;hb=refs%2Fheads%2Fmaster;hp=ce4697f3917edd655a925561b71e11ea08c2664f;hpb=f6002395d2c62dfac2c6fbbd7e8428bb2467a036;p=public-inbox.git

diff --git a/script/public-inbox-clone b/script/public-inbox-clone
index ce4697f3..598979bc 100755
--- a/script/public-inbox-clone
+++ b/script/public-inbox-clone
@@ -2,8 +2,7 @@
 # Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Wrapper to git clone remote public-inboxes
-use strict;
-use v5.10.1;
+use v5.12;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 my $opt = {};
 my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
@@ -14,15 +13,23 @@ usage: public-inbox-clone INBOX_URL [DESTINATION]
 options:
 
   --epoch=RANGE       range of v2 epochs to clone (e.g `2..5', `~0', `~1..')
+  --objstore=DIR      share storage for coderepos
   --torsocks VAL      whether or not to wrap git and curl commands with
                       torsocks (default: `auto')
                       Must be one of: `auto', `no' or `yes'
+  --dry-run | -n      show what would be cloned without cloning
   --verbose | -v      increase verbosity (may be repeated)
     --quiet | -q      increase verbosity (may be repeated)
     -C DIR            chdir to specified directory
 EOF
+
+# cgit calls it `project-list', grokmirror calls it `projectslist',
+# support both :/
 GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@
-		jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help;
+	inbox-config=s inbox-version=i objstore=s manifest=s
+	project-list|projectslist=s post-update-hook=s@
+	prune|p keep-going|k exit-code
+	dry-run|n jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help;
 if ($opt->{help}) { print $help; exit };
 require PublicInbox::Admin; # loads Config
 PublicInbox::Admin::do_chdir(delete $opt->{C});
@@ -35,12 +42,10 @@ defined($dst) or ($dst) = ($url =~ m!/([^/]+)/?\z!);
 index($dst, "\n") >= 0 and die "`\\n' not allowed in `$dst'";
 
 # n.b. this is still a truckload of code...
-require URI;
+require File::Spec;
 require PublicInbox::LEI;
 require PublicInbox::LeiExternal;
 require PublicInbox::LeiMirror;
-require PublicInbox::LeiCurl;
-require PublicInbox::Lock;
 
 $url = PublicInbox::LeiExternal::ext_canonicalize($url);
 my $lei = bless {
@@ -52,8 +57,10 @@ open $lei->{3}, '.' or die "open . $!";
 my $mrr = bless {
 	lei => $lei,
 	src => $url,
-	dst => $dst,
+	dst => File::Spec->canonpath($dst),
 }, 'PublicInbox::LeiMirror';
+
+$? = 0;
 $mrr->do_mirror;
-$mrr->can('_wq_done_wait')->([$mrr, $lei], $$);
+$mrr->can('_wq_done_wait')->($$, $mrr, $lei);
 exit(($lei->{child_error} // 0) >> 8);