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

Reenable command descriptions on macOS 10.15.4+

Browse Source 
Further work on #6270, as recommended in 611a6589ea.

[ci skip]
This commit is contained in:
David Adam
2020-05-01 21:28:35 +08:00
parent a1494c9c22
commit f36c82ce86
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/functions/__fish_complete_man.fish
View File

@@ -6,9 +6,8 @@
# `apropos` with their own, which presumably doesn't have the same problem. # `apropos` with their own, which presumably doesn't have the same problem.
if test (uname) = Darwin if test (uname) = Darwin
set -l darwin_version (uname -r | string split .) set -l darwin_version (uname -r | string split .)
# macOS 15 is Darwin 19, this is an issue at least up to 10.15.3. # macOS 15 is Darwin 19, this is an issue up to and including 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
if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
set -l apropos (command -s apropos) set -l apropos (command -s apropos)
if test "$apropos" = /usr/bin/apropos if test "$apropos" = /usr/bin/apropos
function __fish_complete_man function __fish_complete_man

5
share/functions/__fish_describe_command.fish
View File

@@ -9,9 +9,8 @@
# So we disable this entirely in that case. # So we disable this entirely in that case.
if test (uname) = Darwin if test (uname) = Darwin
set -l darwin_version (uname -r | string split .) set -l darwin_version (uname -r | string split .)
# macOS 15 is Darwin 19, this is an issue at least up to 10.15.3. # macOS 15 is Darwin 19, this is an issue up to and including 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
if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
function __fish_describe_command function __fish_describe_command
end end
# (remember: exit when `source`ing only exits the file, not the shell) # (remember: exit when `source`ing only exits the file, not the shell)