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

Dont use format strings in bootstrap.py

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-06 14:47:44 +05:30
parent 7f9fec061a
commit a1ade8fc42
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,10 @@ def send_data_request():
write_all(tty_fd, dcs_to_kitty('ssh', 'hostname={}:pwfile=PASSWORD_FILENAME:user={}:pw=DATA_PASSWORD'.format(hostname, getpass.getuser()))) write_all(tty_fd, dcs_to_kitty('ssh', 'hostname={}:pwfile=PASSWORD_FILENAME:user={}:pw=DATA_PASSWORD'.format(hostname, getpass.getuser())))
def debug(msg):
write_all(tty_fd, dcs_to_kitty('print', 'debug: {}'.format(msg)))
def apply_env_vars(raw): def apply_env_vars(raw):
global login_shell global login_shell
@ -167,7 +171,7 @@ def exec_zsh_with_integration():
# dont prevent zsh-new-user from running # dont prevent zsh-new-user from running
for q in '.zshrc .zshenv .zprofile .zlogin'.split(): for q in '.zshrc .zshenv .zprofile .zlogin'.split():
if os.path.exists(os.path.join(HOME, q)): if os.path.exists(os.path.join(HOME, q)):
os.environ['ZDOTDIR'] = f'{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
@ -176,7 +180,7 @@ def exec_fish_with_integration():
if not os.environ.get('XDG_DATA_DIRS'): if not os.environ.get('XDG_DATA_DIRS'):
os.environ['XDG_DATA_DIRS'] = shell_integration_dir os.environ['XDG_DATA_DIRS'] = shell_integration_dir
else: else:
os.environ['XDG_DATA_DIRS'] = f'{shell_integration_dir}:' + os.environ['XDG_DATA_DIRS'] os.environ['XDG_DATA_DIRS'] = shell_integration_dir + ':' + os.environ['XDG_DATA_DIRS']
os.environ['KITTY_FISH_XDG_DATA_DIR'] = shell_integration_dir os.environ['KITTY_FISH_XDG_DATA_DIR'] = shell_integration_dir
os.execlp(login_shell, os.path.basename(login_shell), '-l') os.execlp(login_shell, os.path.basename(login_shell), '-l')