From 208f866fc4db9e03d9e74b7c481797e081517c6c Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 24 Apr 2021 02:51:48 -0400 Subject: [PATCH] fix user detection on freebsd always returning root --- archivebox/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archivebox/config.py b/archivebox/config.py index 3083a405..a0d7edd5 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -25,6 +25,7 @@ import os import io import re import sys +import pwd import json import getpass import platform @@ -312,7 +313,7 @@ ALLOWED_IN_OUTPUT_DIR = { DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = { 'TERM_WIDTH': {'default': lambda c: lambda: shutil.get_terminal_size((100, 10)).columns}, - 'USER': {'default': lambda c: getpass.getuser() or os.getlogin()}, + 'USER': {'default': lambda c: pwd.getpwuid(os.geteuid()).pw_name or getpass.getuser() or os.getlogin()}, 'ANSI': {'default': lambda c: DEFAULT_CLI_COLORS if c['USE_COLOR'] else {k: '' for k in DEFAULT_CLI_COLORS.keys()}}, 'PACKAGE_DIR': {'default': lambda c: Path(__file__).resolve().parent},