github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 14:22:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

__fish_describe_command: Remove regex escape hack

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi 2020-02-17 18:23:56 -06:00
parent fba4363c1d
commit 5510443f48
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/functions/__fish_describe_command.fish
View File

@ -20,16 +20,13 @@ if test (uname) = Darwin
end end
function __fish_describe_command -d "Command used to find descriptions for commands" function __fish_describe_command -d "Command used to find descriptions for commands"
# We're going to try to build a regex out of $argv inside awk. # $argv will be inserted directly into the awk regex, so it must be escaped
# Make sure $argv has no special characters. set -l argv_regex (string escape --style=regex "$argv")
# TODO: stop interpolating argv into regex, and remove this hack.
string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
or return
type -q apropos; or return type -q apropos; or return
apropos $argv 2>/dev/null | awk -v FS=" +- +" '{ apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
split($1, names, ", "); split($1, names, ", ");
for (name in names) for (name in names)
if (names[name] ~ /^'"$argv"'.* *\([18]\)/ ) { if (names[name] ~ /^'"$argv_regex"'.* *\([18]\)/ ) {
sub( "( |\t)*\\\([18]\\\)", "", names[name] ); sub( "( |\t)*\\\([18]\\\)", "", names[name] );
sub( " \\\[.*\\\]", "", names[name] ); sub( " \\\[.*\\\]", "", names[name] );
print names[name] "\t" $2; print names[name] "\t" $2;