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

Dont hardcode the ssh options

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-02 14:30:05 +05:30
parent af6ff15ee2
commit bd9a4e9cd8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kittens/ssh/main.py
View File

@ -3,6 +3,7 @@
# License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net> # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
import os import os
import re
import subprocess import subprocess
import sys import sys
@ -40,9 +41,22 @@ exec -a "-$shell_name" "$0"
''' '''
def get_ssh_cli():
other_ssh_args, boolean_ssh_args = [], []
raw = subprocess.Popen(['ssh'], stderr=subprocess.PIPE).stderr.read().decode('utf-8')
for m in re.finditer(r'\[(.+?)\]', raw):
q = m.group(1)
if len(q) < 2 or q[0] != '-':
continue
if ' ' in q:
other_ssh_args.append(q[1])
else:
boolean_ssh_args.extend(q[1:])
return set('-' + x for x in boolean_ssh_args), set('-' + x for x in other_ssh_args)
def parse_ssh_args(args): def parse_ssh_args(args):
boolean_ssh_args = {'-' + x for x in '46AaCfGgKkMNnqsTtVvXxYy'} boolean_ssh_args, other_ssh_args = get_ssh_cli()
other_ssh_args = {'-' + x for x in 'bBcDeEFIJlLmOopQRSWw'}
passthrough_args = {'-' + x for x in 'Nnf'} passthrough_args = {'-' + x for x in 'Nnf'}
ssh_args = [] ssh_args = []
server_args = [] server_args = []