From 59197d12e0ef3a59fa8232bf788a858097b93696 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Sat, 17 Nov 2018 22:03:45 -0600 Subject: [PATCH] Better handling of cases where `man` is not installed Thanks to @floam, adapted to reduce nesting. Works around override of command-not-found handler in previous solution (c.f. 13e025bdb01cc4dd08463ec497a0a3495873702f). --- share/functions/man.fish | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/functions/man.fish b/share/functions/man.fish index 7619b75a1..625b0b187 100644 --- a/share/functions/man.fish +++ b/share/functions/man.fish @@ -1,13 +1,13 @@ +if not command -qs man + # see #5329 and discussion at https://github.com/fish-shell/fish-shell/commit/13e025bdb01cc4dd08463ec497a0a3495873702f + exit +end + function man --description "Format and display the on-line manual pages" # Work around the "builtin" manpage that everything symlinks to, # by prepending our fish datadir to man. This also ensures that man gives fish's # man pages priority, without having to put fish's bin directories first in $PATH - if not command -qs man - echo fish: (_ "Unknown command") 'man' - return 1 - end - set -l manpath if set -q MANPATH set manpath $MANPATH