danvics/howdy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #798 from izvyk/beta

Browse source 
Add doas support
This commit is contained in:
boltgolt 2023-06-25 12:52:49 +02:00 committed by GitHub
commit c17a834a52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
howdy/src/cli.py
View file

@ -11,21 +11,15 @@ import builtins
from i18n import _ from i18n import _
# Try to get the original username (not "root") from shell # Try to get the original username (not "root") from shell
try: sudo_user = os.environ.get("SUDO_USER")
user = os.getlogin() doas_user = os.environ.get("DOAS_USER")
except Exception: env_user = getpass.getuser()
user = os.environ.get("SUDO_USER") user = next((u for u in [sudo_user, doas_user, env_user] if u), "")
# If that fails, try to get the direct user # If that fails, error out
if user == "root" or user is None: if user == "":
env_user = getpass.getuser().strip() print(_("Could not determine user, please use the --user flag"))
sys.exit(1)
# If even that fails, error out
if env_user == "":
print(_("Could not determine user, please use the --user flag"))
sys.exit(1)
else:
user = env_user
# Basic command setup # Basic command setup
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(