From 00eeeade3f716651510f2123b7bbd6648d43a47f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 8 Feb 2022 15:09:46 +0100 Subject: [PATCH] some fixes for updates q7s-cp script --- scripts/q7s-cp.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/scripts/q7s-cp.py b/scripts/q7s-cp.py index e3b1f37c..4666dfa1 100755 --- a/scripts/q7s-cp.py +++ b/scripts/q7s-cp.py @@ -68,21 +68,29 @@ def build_cmd(args): cmd = "scp " if args.recursive: cmd += "-r " + address = "" + port_args = "" + target = args.target if args.flatsat: - cmd += f"{args.source} eive@flatsat.eive.absatvirt.lw:{target}" + address = "eive@flatsat.eive.absatvirt.lw" else: - target = args.target - if args.invert and target == "": + address = "root@localhost" + port_args=f"-P {args.port}" + if args.invert: + if target == "": target = "." - elif target == "": - target = f"/tmp" - if args.invert: - cmd += f"-P {args.port} root@localhost:{args.source} {target}" else: - cmd += f"-P {args.port} {args.source} root@localhost:{target}" - if args.target: - cmd += args.target - return cmd + target = args.target + else: + if target == "": + target = f"/tmp" + else: + target = args.target + if args.invert: + cmd += f"{port_args} {address}:{args.source} {target}" + else: + cmd += f"{port_args} {args.source} {address}:{target}" + return cmd if __name__ == "__main__":