mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 20:33:08 +00:00
harden man
against undef vars
This commit is contained in:
parent
2df89f4b0f
commit
8caab103d8
1 changed files with 10 additions and 9 deletions
|
@ -1,20 +1,21 @@
|
||||||
function man --description "Format and display the on-line manual pages"
|
function man --description "Format and display the on-line manual pages"
|
||||||
|
|
||||||
# Work around the "builtin" manpage that everything symlinks to,
|
# Work around the "builtin" manpage that everything symlinks to,
|
||||||
# by prepending our fish datadir to man. This also ensures that man gives fish's
|
# by prepending our fish datadir to man. This also ensures that man gives fish's
|
||||||
# man pages priority, without having to put fish's bin directories first in $PATH
|
# man pages priority, without having to put fish's bin directories first in $PATH
|
||||||
|
|
||||||
# Notice local but exported variable
|
set -l manpath
|
||||||
set -lx MANPATH (string join : $MANPATH)
|
if set -q MANPATH
|
||||||
if test -z "$MANPATH"
|
set manpath $MANPATH
|
||||||
type -q manpath
|
else if command -qs manpath
|
||||||
and set MANPATH (command manpath)
|
set manpath (command manpath)
|
||||||
end
|
end
|
||||||
|
# Notice local exported copy of the variable.
|
||||||
|
set -lx MANPATH $manpath
|
||||||
|
|
||||||
set -l fish_manpath (dirname $__fish_datadir)/fish/man
|
set -l fish_manpath (dirname $__fish_datadir)/fish/man
|
||||||
if test -d "$fish_manpath" -a -n "$MANPATH"
|
if test -d "$fish_manpath" -a -n "$MANPATH"
|
||||||
set MANPATH "$fish_manpath":$MANPATH
|
set MANPATH $fish_manpath:$MANPATH
|
||||||
|
# Invoke man with this manpath, and we're done.
|
||||||
# Invoke man with this manpath, and we're done
|
|
||||||
command man $argv
|
command man $argv
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue