watch: ensure HUP causes the scanner to be reloaded

[public-inbox.git] / script / public-inbox-mda

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index f739ad0645e99f160c16b940935517fe616e295e..60f817dc08d4afb4f64ef0667da789dc38af889f 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -32,6 +32,7 @@ use PublicInbox::Spamcheck::Spamc;
 my $emergency = $ENV{PI_EMERGENCY} || "$ENV{HOME}/.public-inbox/emergency/";
 $ems = PublicInbox::Emergency->new($emergency);
 my $str = eval { local $/; <STDIN> };
+$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
 $ems->prepare(\$str);
 my $simple = Email::Simple->new(\$str);
 my $config = PublicInbox::Config->new;
@@ -51,7 +52,7 @@ $simple = undef;
 $emm = PublicInbox::Emergency->new($emergency);
 $emm->prepare(\$str);
 $ems = $ems->abort;
-my $mime = Email::MIME->new(\$str);
+my $mime = PublicInbox::MIME->new(\$str);
 $str = '';
 do_exit(0) unless $spam_ok;
 
@@ -82,7 +83,6 @@ PublicInbox::MDA->set_list_headers($mime, $dst);
 my $git = PublicInbox::Git->new($main_repo);
 my $im = PublicInbox::Import->new($git, $dst->{name}, $recipient);
 if (defined $im->add($mime)) {
-       $im->done;
        $emm = $emm->abort;
 } else {
        # this message is similar to what ssoma-mda shows:
@@ -91,4 +91,5 @@ if (defined $im->add($mime)) {
                        " exists\n";
 }
 
+$im->done;
 do_exit(0);