h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-01 21:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Better __fish_describe_command for Macos

Browse Source 
override MANPATH used by apropos with local whatis database and update it once a day

get rid of xargs

Created __fish_apropos and fixed __fish_complete_man to use that as well

moved macos apropos comment
This commit is contained in:
Folke Lemaitre
2020-10-01 15:04:11 +02:00
committed by ridiculousfish
parent f9e426813c
commit a6a0d43c9c
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
share/functions/__fish_describe_command.fish
View File

@@ -2,22 +2,6 @@
# This function is used internally by the fish command completion code
#
# macOS 10.15 "Catalina" has some major issues.
# The whatis database is non-existent, so apropos tries (and fails) to create it every time,
# which takes about half a second.
#
# So we disable this entirely in that case.
if test (uname) = Darwin
set -l darwin_version (uname -r | string split .)
# macOS 15 is Darwin 19, this is an issue up to and including 10.15.3.
if test "$darwin_version[1]" = 19 -a "$darwin_version[2]" -le 3
function __fish_describe_command
end
# (remember: exit when `source`ing only exits the file, not the shell)
exit
end
end
# Perform this check once at startup rather than on each invocation
if not type -q apropos
function __fish_describe_command
@@ -28,7 +12,7 @@ end
function __fish_describe_command -d "Command used to find descriptions for commands"
# $argv will be inserted directly into the awk regex, so it must be escaped
set -l argv_regex (string escape --style=regex "$argv")
apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
__fish_apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
split($1, names, ", ");
for (name in names)
if (names[name] ~ /^'"$argv_regex"'.* *\([18]\)/ ) {