about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-05-04 11:06:41 +0000
committerEric Wong <e@80x24.org>2023-05-04 11:37:28 +0000
commit911bfe6f5beb62f20aafb05d9f3f8c40f8155310 (patch)
tree4f8a975336978fc8a7bcac26db6e08ec9f8258bd
parentf636f401b22a5ef16dd52955b3092c9ce3a9586f (diff)
downloadpublic-inbox-911bfe6f5beb62f20aafb05d9f3f8c40f8155310.tar.gz
This is helpful if compacting multiple
inboxes/extindices/cindices sequentially from the CLI.
-rw-r--r--lib/PublicInbox/Xapcmd.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index f3eb8e4e..1547ce53 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -319,10 +319,11 @@ sub cpdb_retryable ($$) {
 
 sub progress_pfx ($) {
         my ($wip) = @_; # tempdir v2: ([0-9])+-XXXX
-        my @p = split('/', $wip);
+        my @p = split(m'/', $wip);
 
-        # return "xap15/0" for v2, or "xapian15" for v1:
-        ($p[-1] =~ /\A([0-9]+)/) ? "$p[-2]/$1" : $p[-1];
+        # "basename(inboxdir)/xap15/0" for v2,
+        # "basename(inboxdir)/xapian15" for v1:
+        ($p[-1] =~ /\A([0-9]+)/) ? "$p[-3]/$p[-2]/$1" : "$p[-2]/$p[-1]";
 }
 
 sub kill_compact { # setup_signals callback