aboutsummaryrefslogtreecommitdiffhomepage
path: root/share/functions/__fish_print_hostnames.fish
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2015-06-19 16:42:48 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2015-06-19 16:42:48 +0800
commit7d94b7fd1b500e61b9c224f0b95cfffad0a2eaa8 (patch)
tree556d9fc0e03ebdd021f9cd6b3ffce8867e17547e /share/functions/__fish_print_hostnames.fish
parentd018ef39e1abf63dfde80e07f4160d88f76f5e4f (diff)
__fish_print_hostnames: ignore errors from getent
Closes #2137.
Diffstat (limited to 'share/functions/__fish_print_hostnames.fish')
-rw-r--r--share/functions/__fish_print_hostnames.fish6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index eadb21f5..10d611ff 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