From 7d94b7fd1b500e61b9c224f0b95cfffad0a2eaa8 Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 19 Jun 2015 16:42:48 +0800 Subject: [PATCH] __fish_print_hostnames: ignore errors from getent Closes #2137. --- share/functions/__fish_print_hostnames.fish | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish index eadb21f59..10d611ff2 100644 --- a/share/functions/__fish_print_hostnames.fish +++ b/share/functions/__fish_print_hostnames.fish @@ -2,9 +2,9 @@ function __fish_print_hostnames -d "Print a list of known hostnames" # Print all hosts from /etc/hosts - if test -x /usr/bin/getent - getent hosts | tr -s ' ' ' ' | cut -d ' ' -f 2- | tr ' ' '\n' - else if test -r /etc/hosts + if type -q getent + getent hosts 2>/dev/null | tr -s ' ' ' ' | cut -d ' ' -f 2- | tr ' ' '\n' + else if test -r /etc/hosts tr -s ' \t' ' ' < /etc/hosts | sed 's/ *#.*//' | cut -s -d ' ' -f 2- | sgrep -o '[^ ]*' end # Print nfs servers from /etc/fstab