ssh kitten: Fix python bootstrap checking zsh rc files with ZDOTDIR

This commit is contained in:
pagedown 2022-03-24 22:00:16 +08:00
parent a1d203d34a
commit b944cdddeb
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB

View File

@ -219,7 +219,7 @@ def exec_zsh_with_integration():
os.environ['KITTY_ORIG_ZDOTDIR'] = zdotdir os.environ['KITTY_ORIG_ZDOTDIR'] = zdotdir
# dont prevent zsh-newuser-install from running # dont prevent zsh-newuser-install from running
for q in ('.zshrc', '.zshenv', '.zprofile', '.zlogin'): for q in ('.zshrc', '.zshenv', '.zprofile', '.zlogin'):
if os.path.exists(os.path.join(HOME, q)): if os.path.exists(os.path.join(zdotdir, q)):
os.environ['ZDOTDIR'] = shell_integration_dir + '/zsh' os.environ['ZDOTDIR'] = shell_integration_dir + '/zsh'
os.execlp(login_shell, os.path.basename(login_shell), '-l') os.execlp(login_shell, os.path.basename(login_shell), '-l')
os.environ.pop('KITTY_ORIG_ZDOTDIR', None) # ensure this is not propagated os.environ.pop('KITTY_ORIG_ZDOTDIR', None) # ensure this is not propagated