From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei_store: use getpwuid and hostname for ident
Date: Mon, 5 Apr 2021 20:38:13 +0000 [thread overview]
Message-ID: <20210405203813.75213-1-e@80x24.org> (raw)
It's nicer in case a user transfers lei/store across machines
and wants a way to track when/where they imported something.
---
lib/PublicInbox/LeiStore.pm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 094e1555..f8371abf 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -63,8 +63,16 @@ sub git_ident ($) {
my $rdr = {};
open $rdr->{2}, '>', '/dev/null' or die "open /dev/null: $!";
chomp(my $i = $git->qx([qw(var GIT_COMMITTER_IDENT)], undef, $rdr));
- $i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ ? ($1, $2) :
- ('lei user', 'x@example.com')
+ $i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ and return ($1, $2);
+ my ($user, undef, undef, undef, undef, undef, $gecos) = getpwuid($<);
+ ($user) = (($user // $ENV{USER} // '') =~ /([\w\-\.\+]+)/);
+ $user //= 'lei-user';
+ ($gecos) = (($gecos // '') =~ /([\w\-\.\+ \t]+)/);
+ $gecos //= 'lei user';
+ require Sys::Hostname;
+ my ($host) = (Sys::Hostname::hostname() =~ /([\w\-\.]+)/);
+ $host //= 'localhost';
+ ($gecos, "$user\@$host")
}
sub importer {
reply other threads:[~2021-04-05 20:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210405203813.75213-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).