spawn: support chdir via -C option

[public-inbox.git] / lib / PublicInbox / Admin.pm

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 32a9f65edfb7f5a6b808ce5bb0489cd8089d1be9..44b44b6eb185c311b693d30edf5d0ead3c1bfa4b 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -10,6 +10,7 @@ use Cwd 'abs_path';
 use base qw(Exporter);
 our @EXPORT_OK = qw(resolve_repo_dir);
 require PublicInbox::Config;
+use PublicInbox::Spawn qw(popen_rd);
 
 sub resolve_repo_dir {
        my ($cd, $ver) = @_;
@@ -18,28 +19,14 @@ sub resolve_repo_dir {
                $$ver = 2 if $ver;
                return abs_path($prefix);
        }
-
-       my @cmd = qw(git rev-parse --git-dir);
-       my $cmd = join(' ', @cmd);
-       my $pid = open my $fh, '-|';
-       defined $pid or die "forking $cmd failed: $!\n";
-       if ($pid == 0) {
-               if (defined $cd) {
-                       chdir $cd or die "chdir $cd failed: $!\n";
-               }
-               exec @cmd;
-               die "Failed to exec $cmd: $!\n";
-       } else {
-               my $dir = eval {
-                       local $/;
-                       <$fh>;
-               };
-               close $fh or die "error in $cmd (cwd:$cd): $!\n";
-               chomp $dir;
-               $$ver = 1 if $ver;
-               return abs_path($cd) if ($dir eq '.' && defined $cd);
-               abs_path($dir);
-       }
+       my $cmd = [ qw(git rev-parse --git-dir) ];
+       my $fh = popen_rd($cmd, undef, {-C => $cd});
+       my $dir = do { local $/; <$fh> };
+       close $fh or die "error in ".join(' ', @$cmd)." (cwd:$cd): $!\n";
+       chomp $dir;
+       $$ver = 1 if $ver;
+       return abs_path($cd) if ($dir eq '.' && defined $cd);
+       abs_path($dir);
 }
 
 # for unconfigured inboxes
@@ -241,8 +228,7 @@ sub progress_prepare ($) {
        if ($opt->{quiet}) {
                open my $null, '>', '/dev/null' or
                        die "failed to open /dev/null: $!\n";
-               $opt->{1} = fileno($null); # suitable for spawn() redirect
-               $opt->{-dev_null} = $null;
+               $opt->{1} = $null; # suitable for spawn() redirect
        } else {
                $opt->{verbose} ||= 1;
                $opt->{-progress} = sub { print STDERR @_ };