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

More work on bootstrap.py

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-06 12:55:36 +05:30
parent 4552a474b7
commit 1ccc50b21b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,9 +79,14 @@ def apply_env_vars(raw):
login_shell = os.environ.pop('KITTY_LOGIN_SHELL', login_shell) login_shell = os.environ.pop('KITTY_LOGIN_SHELL', login_shell)
def move(src, dest): def move(src, base_dest):
for x in os.listdir(src): for x in os.scandir(src):
os.rename(os.path.join(src, x), os.path.join(dest, x)) dest = os.path.join(base_dest, x.name)
if x.is_dir(follow_symlinks=False):
os.makedirs(dest, exist_ok=True)
move(x.path, dest)
else:
os.rename(x.path, dest)
def compile_terminfo(): def compile_terminfo():
@ -186,7 +191,7 @@ def exec_with_shell_integration():
def main(): def main():
global tty_fd, original_termios_state, login_shell global tty_fd, original_termios_state, login_shell
try: try:
tty_fd = os.open(os.ctermid(), os.O_RDWR | os.O_NONBLOCK | os.O_NOINHERIT) tty_fd = os.open(os.ctermid(), os.O_RDWR | os.O_NONBLOCK | os.O_CLOEXEC)
except OSError: except OSError:
pass pass
else: else:
@ -195,7 +200,7 @@ def main():
except OSError: except OSError:
pass pass
else: else:
tty.makeraw(tty_fd, termios.TCSANOW) tty.setraw(tty_fd, termios.TCSANOW)
new_state = termios.tcgetattr(tty_fd) new_state = termios.tcgetattr(tty_fd)
new_state[3] &= ~termios.ECHO new_state[3] &= ~termios.ECHO
new_state[-1][termios.VMIN] = 1 new_state[-1][termios.VMIN] = 1