From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F39491F47A for ; Tue, 21 Mar 2023 23:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1679440064; bh=firQsLorSh8P3TOvQDfSuEpUT3/KIGbcmMXtSf8yZAY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Vy+haWjuWsw/yLr9d1jcIQAMjWLUy9o1FtDQLDPM8raApuHPrC7Z+YbLAxc1YKeU4 MheaSuY/uP+J1Ks+0UtBxujW0t0T0Md6WmvpMlGmgWVk5tTSu454j2eT68VLcMNqXA 7gjtpGsSUsYHyeBzSlWGU/FwsPvl3+spdX1X+7lk= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 03/28] admin: hoist out resolve_git_dir Date: Tue, 21 Mar 2023 23:07:18 +0000 Message-Id: <20230321230743.3020032-3-e@80x24.org> In-Reply-To: <20230321230743.3020032-1-e@80x24.org> References: <20230321230701.3019936-1-e@80x24.org> <20230321230743.3020032-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We'll be using this for indexing git coderepos, and switch to Perl 5.12 while we're at it since unicode_strings doesn't affect this package. --- lib/PublicInbox/Admin.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 11ea8f83..b34f2256 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -1,10 +1,10 @@ -# Copyright (C) 2019-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # common stuff for administrative command-line tools # Unstable internal API package PublicInbox::Admin; -use strict; +use v5.12; use parent qw(Exporter); our @EXPORT_OK = qw(setup_signals); use PublicInbox::Config; @@ -69,13 +69,19 @@ sub resolve_inboxdir { die "`$try' is not a directory\n"; } } + my $dir = resolve_git_dir($cd); + $$ver = 1 if $ver; + $dir; +} + +sub resolve_git_dir { + my ($cd) = @_; # try v1 bare git dirs 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 @$cmd (cwd:${\($cd // '.')}): $!\n"; + close $fh or die "error in @$cmd (cwd:${\($cd // '.')}): $?\n"; chomp $dir; - $$ver = 1 if $ver; rel2abs_collapsed($dir eq '.' ? ($cd // $dir) : $dir); }