eoptasks: add support for a --noinput flag
This commit is contained in:
parent
c15bfacd64
commit
2c7c3b798a
|
@ -94,6 +94,7 @@ def parse_args():
|
||||||
parser.add_argument('--status-window', action='store_true')
|
parser.add_argument('--status-window', action='store_true')
|
||||||
parser.add_argument('--command-window', action='store_true')
|
parser.add_argument('--command-window', action='store_true')
|
||||||
parser.add_argument('--command-server-name', dest='command_server_name', type=str)
|
parser.add_argument('--command-server-name', dest='command_server_name', type=str)
|
||||||
|
parser.add_argument('--noinput', dest='noinput', action='store_true')
|
||||||
parser.add_argument('-k', dest='keywords', type=str)
|
parser.add_argument('-k', dest='keywords', type=str)
|
||||||
parser.add_argument('cmd', type=str, nargs='?', default=None)
|
parser.add_argument('cmd', type=str, nargs='?', default=None)
|
||||||
parser.add_argument('args', nargs=argparse.REMAINDER)
|
parser.add_argument('args', nargs=argparse.REMAINDER)
|
||||||
|
@ -229,6 +230,8 @@ def command_window(args):
|
||||||
send_status_message(tmux_session_name,
|
send_status_message(tmux_session_name,
|
||||||
{'@type': 'server-result',
|
{'@type': 'server-result',
|
||||||
'info': {args.command_server_name: 'error'}})
|
'info': {args.command_server_name: 'error'}})
|
||||||
|
if args.noinput:
|
||||||
|
break
|
||||||
choice = None
|
choice = None
|
||||||
while choice not in ['r', 's', 'q']:
|
while choice not in ['r', 's', 'q']:
|
||||||
choice = input('[R]etry, [S]hell, [Q]uit --> ').lower()
|
choice = input('[R]etry, [S]hell, [Q]uit --> ').lower()
|
||||||
|
@ -316,10 +319,11 @@ else:
|
||||||
if cluster_name(server.name) in current_clusters:
|
if cluster_name(server.name) in current_clusters:
|
||||||
continue
|
continue
|
||||||
selected_servers.remove(server)
|
selected_servers.remove(server)
|
||||||
window_cmd = '%s --session-name %s --command-window --command-server-name %s "%s" %s' % (
|
window_cmd = '%s --session-name %s --command-window --command-server-name %s %s "%s" %s' % (
|
||||||
sys.argv[0],
|
sys.argv[0],
|
||||||
tmux_session_name,
|
tmux_session_name,
|
||||||
server.name,
|
server.name,
|
||||||
|
'--noinput' if args.noinput else '',
|
||||||
args.cmd,
|
args.cmd,
|
||||||
' '.join(['"%s"' % x for x in args.args]))
|
' '.join(['"%s"' % x for x in args.args]))
|
||||||
session.new_window(
|
session.new_window(
|
||||||
|
|
Loading…
Reference in New Issue