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

Fix help thinking some docs are commands

Browse Source 
This looked at __fish_print_commands, which goes via our man pages to
find the commands (it shouldn't, buuut), and exludes a hard-coded list
of pages.

So we do two thigns:

1. We add the other doc pages to the list
2. We check commands *later* - if we listed something explicitly it
should be used
This commit is contained in:
Fabian Homborg 2021-11-25 21:25:46 +01:00
parent c964edcd68
commit 5ecdcebf8d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/functions/__fish_print_commands.fish
View File

@ -3,7 +3,7 @@ function __fish_print_commands --description "Print a list of documented fish co
for file in $__fish_data_dir/man/man1/**.1* for file in $__fish_data_dir/man/man1/**.1*
string replace -r '.*/' '' -- $file | string replace -r '.*/' '' -- $file |
string replace -r '.1(.gz)?$' '' | string replace -r '.1(.gz)?$' '' |
string match -rv '^fish-(?:completions|doc|tutorial|faq)$' string match -rv '^fish-(?:changelog|completions|doc|tutorial|faq|for-bash-users|interactive|language|releasenotes)$'
end end
end end
end end

10
share/functions/help.fish
View File

@ -128,11 +128,6 @@ function help --description 'Show help for the fish shell'
set fish_help_page "cmds/source.html" set fish_help_page "cmds/source.html"
case globbing case globbing
set fish_help_page "language.html#expand" set fish_help_page "language.html#expand"
case (builtin -n) (__fish_print_commands)
# If the docs aren't installed, __fish_print_commands won't print anything
# Since we document all our builtins, check those at least.
# The alternative is to create this list at build time.
set fish_help_page "cmds/$fish_help_item.html"
case 'completion-*' case 'completion-*'
set fish_help_page "completions.html#$fish_help_item" set fish_help_page "completions.html#$fish_help_item"
case 'tut-*' case 'tut-*'
@ -159,6 +154,11 @@ function help --description 'Show help for the fish shell'
set fish_help_page "interactive.html#$fish_help_item" set fish_help_page "interactive.html#$fish_help_item"
case $tutpages case $tutpages
set fish_help_page "tutorial.html#$fish_help_item" set fish_help_page "tutorial.html#$fish_help_item"
case (builtin -n) (__fish_print_commands)
# If the docs aren't installed, __fish_print_commands won't print anything
# Since we document all our builtins, check those at least.
# The alternative is to create this list at build time.
set fish_help_page "cmds/$fish_help_item.html"
case '' case ''
set fish_help_page "index.html" set fish_help_page "index.html"
case "*" case "*"