From 78d4f22ce4cc017a9955c02b42f5d653a3b43f5f Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 24 Jul 2015 18:35:10 +0800 Subject: [PATCH] __fish_print_mounted: expand scope on non-Linux platforms --- share/functions/__fish_print_mounted.fish | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/functions/__fish_print_mounted.fish b/share/functions/__fish_print_mounted.fish index 6c7852fa0..f33161612 100644 --- a/share/functions/__fish_print_mounted.fish +++ b/share/functions/__fish_print_mounted.fish @@ -1,9 +1,9 @@ function __fish_print_mounted --description 'Print mounted devices' - if test (uname) = Darwin - mount | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/" - else + if test -r /etc/mtab # In mtab, spaces are replaced by a literal '\040' # So it's safe to get the second "field" and then replace it sed -e "s/[^ ]\+ \([^ ]\+\) .*/\\1/" -e "s/\\040/ /g" /etc/mtab + else + mount | cut -d " " -f 1-3|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/" end end