X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox-index;h=578d91d5bf50b767171b490594215b295a52e64f;hb=ac6f7081a484a053ddb60a2f8b6b6487664827ac;hp=2fcf5627d3fc7a59d8f117e11a57bab0874b0db3;hpb=cc22505339e40fe45113ee39a4688070807eba58;p=public-inbox.git

diff --git a/public-inbox-index b/public-inbox-index
index 2fcf5627..578d91d5 100755
--- a/public-inbox-index
+++ b/public-inbox-index
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015, all contributors (git clone git://80x24.org/public-inbox)
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 # Basic tool to create a Xapian search index for a git repository
 # configured for public-inbox.
@@ -10,22 +10,56 @@ use strict;
 use warnings;
 my $usage = "public-inbox-index GIT_DIR";
 use PublicInbox::Config;
-eval { require PublicInbox::Search };
+eval { require PublicInbox::SearchIdx };
 if ($@) {
 	print STDERR "Search::Xapian required for $0\n";
 	exit 1;
 }
+my @dirs;
 
-sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-if (@ARGV) {
-	foreach my $dir (@ARGV) {
-		index_dir($dir);
+sub resolve_git_dir {
+	my ($cd) = @_;
+	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: $!\n";
+		chomp $dir;
+		return $cd if ($dir eq '.' && defined $cd);
+		$dir;
 	}
-};
+}
+
+if (@ARGV) {
+	@dirs = map { resolve_git_dir($_) } @ARGV;
+} else {
+	@dirs = (resolve_git_dir());
+}
+
+sub usage { print STDERR "Usage: $usage\n"; exit 1 }
+usage() unless @dirs;
+
+foreach my $dir (@dirs) {
+	index_dir($dir);
+}
 
 sub index_dir {
 	my ($git_dir) = @_;
 	-d $git_dir or die "$git_dir does not appear to be a git repository\n";
-	my $s = PublicInbox::Search->new($git_dir, 1);
+
+	system('git', "--git-dir=$git_dir", 'update-server-info') and
+		die "git update-server-info failed for $git_dir";
+	my $s = PublicInbox::SearchIdx->new($git_dir, 1);
 	$s->index_sync;
 }