commit
a515f8b81a
@ -30,7 +30,7 @@ Install
|
||||
The install process is very simple on most distros:
|
||||
|
||||
- Install python2, python-gtk2, and python-vte.
|
||||
- Run ./crussh.py hostname [hostname ...]
|
||||
- Run ./crussh.py HOST [HOST ...]
|
||||
|
||||
Bugs & TODO
|
||||
-----------
|
||||
|
21
crussh.py
21
crussh.py
@ -265,7 +265,7 @@ class CruSSH:
|
||||
# give EntryBox default focus on init
|
||||
self.EntryBox.props.has_focus = True
|
||||
|
||||
def __init__(self, hosts, ssh_args=None):
|
||||
def __init__(self, hosts, ssh_cmd="/usr/bin/ssh", ssh_args=None):
|
||||
# load existing config file, if present
|
||||
try:
|
||||
# merge dicts to allow upgrade from old configs
|
||||
@ -279,7 +279,7 @@ class CruSSH:
|
||||
terminal = vte.Terminal()
|
||||
# TODO: disable only this terminal widget on child exit
|
||||
# v.connect("child-exited", lambda term: gtk.main_quit())
|
||||
cmd_str = "/usr/bin/ssh"
|
||||
cmd_str = ssh_cmd
|
||||
if ssh_args is not None:
|
||||
cmd_str += " " + ssh_args
|
||||
cmd_str += " " + host
|
||||
@ -300,22 +300,25 @@ if __name__ == "__main__":
|
||||
|
||||
### Parse CLI Args ###
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Connect to multiple servers in parallel.",
|
||||
description="Connect to multiple hosts in parallel.",
|
||||
usage="%(prog)s [OPTIONS] [--] HOST [HOST ...]",
|
||||
epilog="* NOTE: You can pass options to ssh if you add '--' before your list of hosts")
|
||||
parser.add_argument("--ssh", dest='ssh', default="/usr/bin/ssh",
|
||||
help="specify the SSH executable to use (default: %(default)s)")
|
||||
(args, hosts) = parser.parse_known_args()
|
||||
|
||||
if len(hosts) == 0:
|
||||
parser.print_usage()
|
||||
parser.exit(2)
|
||||
|
||||
if "--" in hosts:
|
||||
offset = hosts.index("--") + 1
|
||||
ssh_args = " ".join(hosts[0:offset])
|
||||
hosts = hosts[offset:]
|
||||
else:
|
||||
try:
|
||||
offset = hosts.index("--")
|
||||
except:
|
||||
ssh_args = None
|
||||
else:
|
||||
ssh_args = " ".join(hosts[0:offset])
|
||||
hosts = hosts[offset + 1:]
|
||||
|
||||
### Start Execution ###
|
||||
crussh = CruSSH(hosts, ssh_args)
|
||||
crussh = CruSSH(hosts, args.ssh, ssh_args)
|
||||
gtk.main()
|
||||
|
Loading…
Reference in New Issue
Block a user