parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

ssh.py: use check_programs_wrap() for ssh and scp binaries

Browse source
This commit is contained in:
InsanePrawn 2022-08-20 02:24:17 +02:00
parent 27e7fe9a10
commit 5b218e64c8
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ssh.py
View file

@ -7,6 +7,7 @@ import click
from config import config from config import config
from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
from exec.cmd import run_cmd from exec.cmd import run_cmd
from wrapper import check_programs_wrap
@click.command(name='ssh') @click.command(name='ssh')
@ -24,6 +25,7 @@ def run_ssh_command(cmd: list[str] = [],
host: str = SSH_DEFAULT_HOST, host: str = SSH_DEFAULT_HOST,
port: int = SSH_DEFAULT_PORT, port: int = SSH_DEFAULT_PORT,
alloc_tty: bool = True): alloc_tty: bool = True):
check_programs_wrap(['ssh'])
if not user: if not user:
user = config.get_profile()['username'] user = config.get_profile()['username']
keys = find_ssh_keys() keys = find_ssh_keys()
@ -50,6 +52,7 @@ def run_ssh_command(cmd: list[str] = [],
def scp_put_files(src: list[str], dst: str, user: str = None, host: str = SSH_DEFAULT_HOST, port: int = SSH_DEFAULT_PORT): def scp_put_files(src: list[str], dst: str, user: str = None, host: str = SSH_DEFAULT_HOST, port: int = SSH_DEFAULT_PORT):
check_programs_wrap(['scp'])
if not user: if not user:
user = config.get_profile()['username'] user = config.get_profile()['username']
keys = find_ssh_keys() keys = find_ssh_keys()
@ -81,6 +84,7 @@ def find_ssh_keys():
def copy_ssh_keys(root_dir: str, user: str): def copy_ssh_keys(root_dir: str, user: str):
check_programs_wrap(['ssh-keygen'])
authorized_keys_file = os.path.join( authorized_keys_file = os.path.join(
root_dir, root_dir,
'home', 'home',