cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9809 from mscherer/fix_9695

Browse source 
Make sure ansible-doc work when stdin is not a tty
This commit is contained in:
Toshio Kuratomi 2014-12-16 13:02:47 -08:00
commit f998e65701
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/ansible-doc
View file

@ -71,7 +71,7 @@ def pager(text):
pager_print(text)
else:
pager_pipe(text, os.environ['PAGER'])
elif hasattr(os, 'system') and os.system('(less) 2> /dev/null') == 0:
elif subprocess.call('(less --version) 2> /dev/null', shell = True) == 0:
pager_pipe(text, 'less')
else:
pager_print(text)
@ -165,7 +165,10 @@ def get_snippet_text(doc):
return "\n".join(text)
def get_module_list_text(module_list):
columns = max(60, int(os.popen('stty size', 'r').read().split()[1]))
tty_size = 0
if os.isatty(0):
tty_size = int(os.popen('stty size', 'r').read().split()[1])
columns = max(60, tty_size)
displace = max(len(x) for x in module_list)
linelimit = columns - displace - 5
text = []