mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 21:33:09 +00:00
__fish_man_page: simplify
This helps the next commit. No functional change.
This commit is contained in:
parent
72ae46e922
commit
bb325e497a
1 changed files with 8 additions and 13 deletions
|
@ -8,7 +8,7 @@ function __fish_man_page
|
|||
return
|
||||
end
|
||||
|
||||
# Skip leading commands and display then manpage of following command
|
||||
# Skip leading commands and display the manpage of following command
|
||||
while set -q args[2]
|
||||
and string match -qr -- '^(and|begin|builtin|caffeinate|command|doas|entr|env|exec|if|mosh|nice|not|or|pipenv|prime-run|setsid|sudo|systemd-nspawn|time|watch|while|xargs|.*=.*)$' $args[1]
|
||||
set -e args[1]
|
||||
|
@ -17,19 +17,14 @@ function __fish_man_page
|
|||
# If there are at least two tokens not starting with "-", the second one might be a subcommand.
|
||||
# Try "man first-second" and fall back to "man first" if that doesn't work out.
|
||||
set -l maincmd (basename $args[1])
|
||||
# HACK: If stderr is not attached to a terminal `less` (the default pager)
|
||||
# wouldn't use the alternate screen.
|
||||
# But since we don't know what pager it is, and because `man` is totally underspecified,
|
||||
# the best we can do is to *try* the man page, and assume that `man` will return false if it fails.
|
||||
# See #7863.
|
||||
if set -q args[2]
|
||||
# HACK: If stderr is not attached to a terminal `less` (the default pager)
|
||||
# wouldn't use the alternate screen.
|
||||
# But since we don't know what pager it is, and because `man` is totally underspecified,
|
||||
# the best we can do is to *try* the man page, and assume that `man` will return false if it fails.
|
||||
# See #7863.
|
||||
if man "$maincmd-$args[2]" &>/dev/null
|
||||
man "$maincmd-$args[2]"
|
||||
else if man "$maincmd" &>/dev/null
|
||||
man "$maincmd"
|
||||
else
|
||||
printf \a
|
||||
end
|
||||
and man "$maincmd-$args[2]" &>/dev/null
|
||||
man "$maincmd-$args[2]"
|
||||
else
|
||||
if man "$maincmd" &>/dev/null
|
||||
man "$maincmd"
|
||||
|
|
Loading…
Reference in a new issue