lei: refine help/option parsing, implement "init"

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index 1b5af3a1cc1b2f0b8127aeb58f337c16310e3551..fce088e9336473d3988e05981fc7cc5c631a1fb4 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -21,13 +21,19 @@ if (eval { require IO::FDPass; 1 }) { # use daemon to reduce load time
        };
        my $sock = IO::Socket::UNIX->new(Peer => $path, Type => SOCK_STREAM);
        unless ($sock) { # start the daemon if not started
-               my $err = $!;
-               require PublicInbox::LeiDaemon;
-               $err = PublicInbox::LeiDaemon::lazy_start($path, $err);
+               my $err = $! + 0;
+               my $env = { PERL5LIB => join(':', @INC) };
+               my $cmd = [ $^X, qw[-MPublicInbox::LeiDaemon
+                       -E PublicInbox::LeiDaemon::lazy_start(@ARGV)],
+                       $path, $err ];
+               require PublicInbox::Spawn;
+               waitpid(PublicInbox::Spawn::spawn($cmd, $env), 0);
+               warn "lei-daemon exited with \$?=$?\n" if $?;
+
                # try connecting again anyways, unlink+bind may be racy
                $sock = IO::Socket::UNIX->new(Peer => $path,
                                                Type => SOCK_STREAM) // die
-                       "connect($path): $! (bind($path): $err)";
+                       "connect($path): $! (after attempted daemon start)";
        }
        my $pwd = $ENV{PWD};
        my $cwd = cwd();
@@ -54,5 +60,5 @@ if (eval { require IO::FDPass; 1 }) { # use daemon to reduce load time
        }
 } else { # for systems lacking IO::FDPass
        require PublicInbox::LeiDaemon;
-       PublicInbox::LeiDaemon::oneshot();
+       PublicInbox::LeiDaemon::oneshot(__PACKAGE__);
 }