Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-tools: add customizable VM output color

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-26 01:31:39 +02:00
parent d5be1b32fa
commit 6e8dc37f9b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qvm-tools/qvm-run
View File

@ -77,8 +77,8 @@ def vm_run_cmd(vm, cmd, options):
if options.verbose: if options.verbose:
print >> sys.stderr, "Running command on VM: '{0}'...".format(vm.name) print >> sys.stderr, "Running command on VM: '{0}'...".format(vm.name)
if options.passio and options.color_output: if options.passio and options.color_output is not None:
print "\033[0;31m", print "\033[0;%dm" % options.color_output,
try: try:
def tray_notify_generic(level, str): def tray_notify_generic(level, str):
@ -94,7 +94,7 @@ def vm_run_cmd(vm, cmd, options):
wait = options.passio, localcmd = options.localcmd, wait = options.passio, localcmd = options.localcmd,
gui = options.gui, filter_esc = options.filter_esc) gui = options.gui, filter_esc = options.filter_esc)
except QubesException as err: except QubesException as err:
if options.passio and options.color_output: if options.passio and options.color_output is not None:
print "\033[0m", print "\033[0m",
if options.tray: if options.tray:
tray_notify_error(str(err)) tray_notify_error(str(err))
@ -102,7 +102,7 @@ def vm_run_cmd(vm, cmd, options):
print >> sys.stderr, "ERROR(%s): %s" % (str(vm.name), str(err)) print >> sys.stderr, "ERROR(%s): %s" % (str(vm.name), str(err))
return 1 return 1
finally: finally:
if options.passio and options.color_output: if options.passio and options.color_output is not None:
print "\033[0m", print "\033[0m",
def main(): def main():
@ -162,6 +162,11 @@ def main():
dest="color_output", default=None, dest="color_output", default=None,
help="Disable marking VM output with red color") help="Disable marking VM output with red color")
parser.add_option("--color-output", action="store", type="int",
dest="color_output",
help="Force marking VM output with given ANSI style ("
"use 31 for red)")
(options, args) = parser.parse_args () (options, args) = parser.parse_args ()
if options.passio and options.run_on_all_running: if options.passio and options.run_on_all_running:
@ -171,7 +176,10 @@ def main():
options.verbose = False options.verbose = False
if options.color_output is None: if options.color_output is None:
options.color_output = os.isatty(sys.stdout.fileno()) if os.isatty(sys.stdout.fileno()):
options.color_output = 31
elif options.color_output is False:
options.color_output = None
if options.shutdown: if options.shutdown:
print >>sys.stderr, "WARNING: --shutdown is deprecated. Use qvm-shutdown instead." print >>sys.stderr, "WARNING: --shutdown is deprecated. Use qvm-shutdown instead."