update copyrights for 2018

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

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 61f21d7060c345378ab1e96893e4b589968a89b5..594a3d9ca8dff6daf743e880b2cf72f7fb86a350 100755 (executable)
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <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.
 # Usage with libeatmydata <https://www.flamingspork.com/projects/libeatmydata/>
@@ -9,8 +9,13 @@
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+use Cwd 'abs_path';
 my $usage = "public-inbox-index GIT_DIR";
 use PublicInbox::Config;
+my $config = eval { PublicInbox::Config->new } || eval {
+       warn "public-inbox unconfigured for serving, indexing anyways...\n";
+       {}
+};
 eval { require PublicInbox::SearchIdx };
 if ($@) {
        print STDERR "Search::Xapian required for $0\n";
@@ -42,8 +47,8 @@ sub resolve_git_dir {
                };
                close $fh or die "error in $cmd: $!\n";
                chomp $dir;
-               return $cd if ($dir eq '.' && defined $cd);
-               $dir;
+               return abs_path($cd) if ($dir eq '.' && defined $cd);
+               abs_path($dir);
        }
 }
 
@@ -56,13 +61,26 @@ if (@ARGV) {
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 usage() unless @dirs;
 
+foreach my $k (keys %$config) {
+       $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
+       my $name = $1;
+       my $v = $config->{$k};
+       for my $i (0..$#dirs) {
+               next if $dirs[$i] ne $v;
+               my $ibx = $config->lookup_name($name);
+               $dirs[$i] = $ibx if $ibx;
+       }
+}
+
 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";
+       if (!ref $git_dir && ! -d $git_dir) {
+               die "$git_dir does not appear to be a git repository\n";
+       }
        my $s = PublicInbox::SearchIdx->new($git_dir, 1);
        $s->index_sync({ reindex => $reindex });
 }