From 65789a281a27854565afc3887e7ede13b3d69081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krystian=20Du=C5=BCy=C5=84ski?= Date: Fri, 21 Apr 2023 22:36:41 +0200 Subject: [PATCH] added support for passing ssh port in --override-ip option --- mikrotik_configurator/__main__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mikrotik_configurator/__main__.py b/mikrotik_configurator/__main__.py index 4c00eef..2d36f3c 100644 --- a/mikrotik_configurator/__main__.py +++ b/mikrotik_configurator/__main__.py @@ -28,9 +28,14 @@ def main(): host = cfg["host"] has_flash = cfg.get("has_flash", False) + ssh_port = 22 if args.override_ip is not None: host = args.override_ip + if ":" in host: + host, ssh_port_str = host.split(":", 1) + ssh_port = int(ssh_port_str) + files = args.files orders = [float(os.path.basename(x).split("-")[0].replace("_", ".")) for x in files] @@ -73,6 +78,7 @@ def main(): cargs = [ "scp", + "-P", str(ssh_port), "-o", "StrictHostKeyChecking=false", "-o", "UserKnownHostsFile=/dev/null", "-o", "PubkeyAcceptedKeyTypes=+ssh-rsa", @@ -91,6 +97,7 @@ def main(): cmd = f"/import file={base_path}{script_name}" cargs = [ "ssh", + "-p", str(ssh_port), "-o", "StrictHostKeyChecking=false", "-o", "UserKnownHostsFile=/dev/null", "-o", "PubkeyAcceptedKeyTypes=+ssh-rsa",