diff options
Diffstat (limited to 'bin/hostinfo')
| -rwxr-xr-x | bin/hostinfo | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/bin/hostinfo b/bin/hostinfo index 5a2a516..5cb4247 100755 --- a/bin/hostinfo +++ b/bin/hostinfo @@ -19,9 +19,9 @@ def _get_data(path): stream = file(path, 'r') return yaml.load(stream) -def print_info(path, key=None, oneline=False, verbose=False): +def print_info(path, key=None, oneline=False, verbose=False, nospaces=False): data = _get_data(path) - p = printer.Printer(data, oneline, verbose) + p = printer.Printer(data, oneline, verbose, nospaces) p.info(key) def _print_keys(data, prefix = ''): @@ -71,14 +71,24 @@ def find_host(host): def main(): self_name = sys.argv.pop(0) - optlist, args = getopt.gnu_getopt(sys.argv, 'ofkv', - ['oneline', 'file', 'keys', 'verbose']) - flags = [opt for (opt, value) in optlist if value == ''] - - file = '--file' in flags or '-f' in flags - oneline = '--oneline' in flags or '-o' in flags - keys = '--keys' in flags or '-k' in flags - verbose = '--verbose' in flags or '-v' in flags + file = oneline = keys = verbose = nospaces = False + try: + optlist, args = getopt.gnu_getopt(sys.argv, 'ofkvn', + ['oneline', 'file', 'keys', 'verbose', + 'nospaces']) + opts = {} + for key, value in optlist: + opts[key] = value + + file = any([o in opts for o in ['--file', '-f']]) + oneline = any([o in opts for o in ['--oneline', '-f']]) + keys = any([o in opts for o in ['--keys', '-k']]) + verbose = any([o in opts for o in ['--verbose', '-v']]) + nospaces = any([o in opts for o in ['--nospaces', '-n']]) + except getopt.GetoptError, e: + print("Error: %s" % e) + print + args = [] if len(args) < 1: print('Usage: %s <host> [info]' % self_name) @@ -98,7 +108,7 @@ def main(): if len(args) > 1: key = args[1] - print_info(path, key=key, oneline=oneline, verbose=verbose) + print_info(path, key=key, oneline=oneline, verbose=verbose, nospaces=nospaces) sys.exit(0) if __name__ == '__main__': |