1 files changed, 20 insertions, 8 deletions
diff --git a/script/public-inbox-purge b/script/public-inbox-purge
index c9b69c3d..618cfec4 100755
--- a/script/public-inbox-purge
+++ b/script/public-inbox-purge
@@ -1,5 +1,5 @@
  #!/usr/bin/perl -w
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
  # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
  #
  # Used for purging messages entirely from a public-inbox.  Currently
@@ -10,23 +10,35 @@ use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
  use PublicInbox::AdminEdit;
  PublicInbox::Admin::check_require('-index');
  use PublicInbox::Filter::Base qw(REJECT);
-use PublicInbox::MIME;
+use PublicInbox::Eml;
  require PublicInbox::V2Writable;
  
-my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
+my $help = <<EOF;
+usage: public-inbox-purge [--all] [INBOX_DIRS] </path/to/message
+
+  erase message entirely from an inbox (including history)
+
+options:
+
+  --all               purge from all configured inboxes
+
+See public-inbox-purge(1) man page for full documentation.
+EOF
+
  my $opt = { verbose => 1, all => 0, -min_inbox_version => 2 };
-GetOptions($opt, @PublicInbox::AdminEdit::OPT) or
-        die "bad command-line args\n$usage\n";
+GetOptions($opt, @PublicInbox::AdminEdit::OPT, 'C=s@') or die $help;
+if ($opt->{help}) { print $help; exit 0 };
  
+PublicInbox::Admin::do_chdir(delete $opt->{C});
  my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt);
  PublicInbox::AdminEdit::check_editable(\@ibxs);
  
-my $data = do { local $/; scalar <STDIN> };
-$data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
+my $data = PublicInbox::IO::read_all \*STDIN;
+PublicInbox::Eml::strip_from($data);
  my $n_purged = 0;
  
  foreach my $ibx (@ibxs) {
-        my $mime = PublicInbox::MIME->new($data);
+        my $mime = PublicInbox::Eml->new($data);
          my $v2w = PublicInbox::V2Writable->new($ibx, 0);
  
          my $commits = $v2w->purge($mime) || [];