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

Dont need atexit anymore since cleanup only closes tty_fd

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

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

@ -2,7 +2,6 @@
# License: GPLv3 Copyright: 2022, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2022, Kovid Goyal <kovid at kovidgoyal.net>
import atexit
import base64 import base64
import io import io
import os import os
@ -49,7 +48,7 @@ def write_all(fd, data) -> None:
data = data[n:] data = data[n:]
def dcs_to_kitty(type, payload): def dcs_to_kitty(payload, type='ssh'):
if isinstance(payload, str): if isinstance(payload, str):
payload = payload.encode('utf-8') payload = payload.encode('utf-8')
payload = base64.standard_b64encode(payload) payload = base64.standard_b64encode(payload)
@ -57,12 +56,11 @@ def dcs_to_kitty(type, payload):
def send_data_request(): def send_data_request():
write_all(tty_fd, dcs_to_kitty( write_all(tty_fd, dcs_to_kitty('id=REQUEST_ID:pwfile=PASSWORD_FILENAME:pw=DATA_PASSWORD'))
'ssh', 'id=REQUEST_ID:pwfile=PASSWORD_FILENAME:pw=DATA_PASSWORD'))
def debug(msg): def debug(msg):
data = dcs_to_kitty('print', 'debug: {}'.format(msg)) data = dcs_to_kitty('debug: {}'.format(msg), 'print')
if tty_fd == -1: if tty_fd == -1:
with open(os.ctermid(), 'wb') as fl: with open(os.ctermid(), 'wb') as fl:
write_all(fl.fileno(), data) write_all(fl.fileno(), data)
@ -217,7 +215,8 @@ def main():
global tty_fd, login_shell global tty_fd, login_shell
tty_fd = os.open(os.ctermid(), os.O_RDWR | os.O_CLOEXEC) tty_fd = os.open(os.ctermid(), os.O_RDWR | os.O_CLOEXEC)
try: try:
send_data_request() if request_data:
send_data_request()
get_data() get_data()
finally: finally:
cleanup() cleanup()
@ -236,5 +235,4 @@ def main():
os.execlp(login_shell, '-' + os.path.basename(login_shell)) os.execlp(login_shell, '-' + os.path.basename(login_shell))
atexit.register(cleanup)
main() main()