github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-01 02:04:16 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "__fish_describe_command: Remove awk"

Browse Source 
Dealing with macOS output in a fast manner using `string` is surprisingly hard, given that it features lines like

    gls(1), ls(1)            - list directory contents

Printing the "gls" with the description and the "ls" with the description requires a `while read` loop, and that's too slow.

This reverts commit 7784a5f23c.

[ci skip]
This commit is contained in:
Fabian Homborg 2019-04-19 20:57:45 +02:00
parent 2edfab685a
commit 46911a5e7f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
share/functions/__fish_describe_command.fish
View File

@ -3,8 +3,20 @@
# #
function __fish_describe_command -d "Command used to find descriptions for commands" function __fish_describe_command -d "Command used to find descriptions for commands"
command -sq apropos; or return # We're going to try to build a regex out of $argv inside awk.
# Some systems could use -s 1,8 here, but FreeBSD doesn't have that. # Make sure $argv has no special characters.
apropos $argv 2>/dev/null | string replace -rf '^(\S+) \(\S+\)\s+- (.*)' '$1\t$2' \ # TODO: stop interpolating argv into regex, and remove this hack.
| string match (string replace -a '*' '\*' -- "$argv")"*" string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
or return
type -q apropos; or return
apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
split($1, names, ", ");
for (name in names)
if (names[name] ~ /^'"$argv"'.* *\([18]\)/ ) {
sub( "( |\t)*\\\([18]\\\)", "", names[name] );
sub( " \\\[.*\\\]", "", names[name] );
print names[name] "\t" $2;
}
}'
end end