From f7edfba5d7c52bb9d2e1d11c9568fb2e0ca14982 Mon Sep 17 00:00:00 2001 From: Geoff Nixon Date: Fri, 31 Jan 2020 13:55:08 -0800 Subject: [PATCH] Avoid apropos on macOS 10.15 with man completion Same issue occurs here, as in #6270 (and fixed in 611a658 for `__fish_describe_command.fish`). Same reason. I've just copied the same workaround and changed the function name to match. --- share/functions/__fish_complete_man.fish | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish index 5fbe87345..edb5511bd 100644 --- a/share/functions/__fish_complete_man.fish +++ b/share/functions/__fish_complete_man.fish @@ -1,3 +1,20 @@ +# 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 at least up to 10.15.3. + # If this is fixed in later versions uncomment the second check. + if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3 + function __fish_complete_man + end + # (remember: exit when `source`ing only exits the file, not the shell) + exit + end +end + function __fish_complete_man # Try to guess what section to search in. If we don't know, we # use [^)]*, which should match any section.