Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages 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
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.
# Make sure $argv has no special characters.
# TODO: stop interpolating argv into regex, and remove this hack.
string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
or return
# $argv will be inserted directly into the awk regex, so it must be escaped
set -l argv_regex (string escape --style=regex "$argv")
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]\)/ ) {
if (names[name] ~ /^'"$argv_regex"'.* *\([18]\)/ ) {
sub( "( |\t)*\\\([18]\\\)", "", names[name] );
sub( " \\\[.*\\\]", "", names[name] );
print names[name] "\t" $2;