KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup previous PR

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-19 17:20:09 +05:30
parent 9a8e92fade
commit 47d7e812a3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell-integration/ssh/bootstrap.py
View File

@ -20,11 +20,11 @@ echo_on = int('ECHO_ON')
data_dir = shell_integration_dir = '' data_dir = shell_integration_dir = ''
request_data = int('REQUEST_DATA') request_data = int('REQUEST_DATA')
leading_data = b'' leading_data = b''
try:
login_shell = pwd.getpwuid(os.geteuid()).pw_shell or os.environ.get('SHELL') or '/bin/sh'
except KeyError:
login_shell = os.environ.get('SHELL') or '/bin/sh' login_shell = os.environ.get('SHELL') or '/bin/sh'
with suppress(Exception): try:
login_shell = pwd.getpwuid(os.geteuid()).pw_shell or login_shell
except KeyError:
with contextlib.suppress(Exception):
print('Failed to read login shell via getpwuid() for current user, falling back to', login_shell, file=sys.stderr) print('Failed to read login shell via getpwuid() for current user, falling back to', login_shell, file=sys.stderr)
export_home_cmd = b'EXPORT_HOME_CMD' export_home_cmd = b'EXPORT_HOME_CMD'
if export_home_cmd: if export_home_cmd: