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

Exclude junk directories when adding user files as well

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-06 10:00:02 +05:30
parent 31b01d42c0
commit 31ea5d74a7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/ssh/main.py
View File

@ -71,6 +71,10 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str]) -> bytes:
def filter_from_globs(*pats: str) -> Callable[[tarfile.TarInfo], Optional[tarfile.TarInfo]]: def filter_from_globs(*pats: str) -> Callable[[tarfile.TarInfo], Optional[tarfile.TarInfo]]:
def filter(tarinfo: tarfile.TarInfo) -> Optional[tarfile.TarInfo]: def filter(tarinfo: tarfile.TarInfo) -> Optional[tarfile.TarInfo]:
for junk_dir in ('.DS_Store', '__pycache__'):
for pat in (f'*/{junk_dir}', '*/{junk_dir}/*'):
if fnmatch.fnmatch(tarinfo.name, pat):
return None
for pat in pats: for pat in pats:
if fnmatch.fnmatch(tarinfo.name, pat): if fnmatch.fnmatch(tarinfo.name, pat):
return None return None
@ -110,7 +114,6 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str]) -> bytes:
tf.add(shell_integration_dir, arcname=arcname, filter=filter_from_globs( tf.add(shell_integration_dir, arcname=arcname, filter=filter_from_globs(
f'{arcname}/ssh/bootstrap.*', # bootstrap files are sent as command line args f'{arcname}/ssh/bootstrap.*', # bootstrap files are sent as command line args
f'{arcname}/zsh/kitty.zsh', # present for legacy compat not needed by ssh kitten f'{arcname}/zsh/kitty.zsh', # present for legacy compat not needed by ssh kitten
'*/.DS_Store',
)) ))
tf.add(terminfo_dir, arcname='home/.terminfo', filter=normalize_tarinfo) tf.add(terminfo_dir, arcname='home/.terminfo', filter=normalize_tarinfo)
return buf.getvalue() return buf.getvalue()