* [PATCH] lei_store: use getpwuid and hostname for ident
@ 2021-04-05 20:38 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-04-05 20:38 UTC (permalink / raw)
To: meta
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 {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-05 20:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-05 20:38 [PATCH] lei_store: use getpwuid and hostname for ident Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).