github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 09:20:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

completion generator: Define parent_paths directly if MANPATH is set

Browse Source
This commit is contained in:
Fabian Homborg 2017-02-03 18:16:24 +01:00
parent 3e17b8fccc
commit 94b71353ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/tools/create_manpage_completions.py
View File

@ -859,7 +859,7 @@ def get_paths_from_manpath():
import subprocess, os
# $MANPATH takes precedence, just like with `man` on the CLI.
if os.getenv("MANPATH"):
manpath = os.getenv("MANPATH")
parent_paths = os.getenv("MANPATH").strip().split(':')
else:
# Some systems have manpath, others have `man --path` (like Haiku).
# TODO: Deal with systems that have neither (OpenBSD)
@ -870,7 +870,7 @@ def get_paths_from_manpath():
continue
break # Command exists, use it.
manpath, err_data = proc.communicate()
parent_paths = manpath.decode().strip().split(':')
parent_paths = manpath.decode().strip().split(':')
if not parent_paths or proc.returncode > 0:
# HACK: Use some fallback in case we can't get anything else.
# `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set, so just use the default for mandoc (minus /usr/X11R6/man, because that's not relevant).