Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mount completions: don't truncate mounts with spaces in them"

Browse source 
This does not work with util-linux mount, because that prints a "type" in between.

This reverts commit 1c364722a7.
This commit is contained in:
Fabian Homborg 2018-11-17 14:06:15 +01:00
parent 1c364722a7
commit 7b21f1c3cb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
share/functions/__fish_print_mounted.fish
View file

@ -1,5 +1,5 @@
function __fish_print_mounted --description 'Print mounted devices'
if [ -r /etc/mtab ]
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
# \011 encodes a tab, \012 encodes a newline and \\ encodes a backslash
@ -7,6 +7,6 @@ function __fish_print_mounted --description 'Print mounted devices'
# and tabs because of descriptions
string replace -r '\S+ (\S+) .*' '$1' </etc/mtab | string replace -a "\040" " " | string replace -a "\011" \t | string replace -a "\012" \n | string replace -a "\\\\" "\\"
else
mount | string replace -r '^(\S+) \S+ ([\ \S]+) \(.*\)' '$1\n$2' | string replace -r '[\d.]*:/' '/' | string match '/*'
mount | string replace -r '^(\S+) \S+ (\S+) .*' '$1\n$2' | string replace -r '[\d.]*:/' '/' | string match '/*'
end
end