mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-12-19 05:13:44 +08:00
completions/diskutil: list all volumes, not just the writeable ones
Discussion in #10574.
This commit is contained in:
parent
421e27b1bf
commit
98fcb1c6ba
|
@ -14,11 +14,6 @@ function __fish_diskutil_mounted_volumes
|
||||||
printf '%s\n' $mountpoints
|
printf '%s\n' $mountpoints
|
||||||
end
|
end
|
||||||
|
|
||||||
function __fish_diskutil_writeable_volumes
|
|
||||||
set -l mountpoints (path filter -w /Volumes/*)
|
|
||||||
printf '%s\n' $mountpoints
|
|
||||||
end
|
|
||||||
|
|
||||||
function __fish_diskutil_using_not_subcommand
|
function __fish_diskutil_using_not_subcommand
|
||||||
not __fish_seen_subcommand_from apfs
|
not __fish_seen_subcommand_from apfs
|
||||||
and not __fish_seen_subcommand_from appleRAID
|
and not __fish_seen_subcommand_from appleRAID
|
||||||
|
@ -58,7 +53,7 @@ complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand umountDisk' -a
|
||||||
|
|
||||||
# eject
|
# eject
|
||||||
complete -f -c diskutil -n __fish_use_subcommand -a eject -d 'Eject a volume or disk'
|
complete -f -c diskutil -n __fish_use_subcommand -a eject -d 'Eject a volume or disk'
|
||||||
complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand eject' -a '(__fish_diskutil_writeable_volumes ; __fish_diskutil_devices)'
|
complete -f -c diskutil -n '__fish_diskutil_using_not_subcommand eject' -a '(__fish_diskutil_volumes ; __fish_diskutil_devices)'
|
||||||
|
|
||||||
# mount
|
# mount
|
||||||
complete -f -c diskutil -n __fish_use_subcommand -a mount -d 'Mount a single volume'
|
complete -f -c diskutil -n __fish_use_subcommand -a mount -d 'Mount a single volume'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user