aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Frederik “Freso” S. Olesen <freso.dk@gmail.com>2016-05-27 12:19:01 +0200
committerGravatar Kurtis Rader <krader@skepticism.us>2016-05-27 14:56:47 -0700
commit7af9e1f5c5bfe9b295309094fb03ef27ee6ca1fd (patch)
tree7c5c75401d53ff1771761cdb8684011b158964ca
parent980fb592321fc36004a4c72f430b3cd461d95281 (diff)
Split off __fish_complete_blockdevice from mount.fish.
The __fish_complete_blockdevice function can be useful to other completions than mount.fish, so it should live on its own so its available to those.
-rw-r--r--share/completions/mount.fish8
-rw-r--r--share/functions/__fish_complete_blockdevice.fish12
2 files changed, 12 insertions, 8 deletions
diff --git a/share/completions/mount.fish b/share/completions/mount.fish
index ba0d985f..9375a473 100644
--- a/share/completions/mount.fish
+++ b/share/completions/mount.fish
@@ -1,12 +1,4 @@
# Completions for mount
-function __fish_complete_blockdevice
- set -l cmd (commandline -ct)
- [ "" = "$cmd" ]; and return
- for f in $cmd*
- [ -b $f ]; and printf "%s\t%s\n" $f "Block device"
- [ -d $f ]; and printf "%s\n" $f/
- end
-end
complete -x -c mount -a '(__fish_complete_blockdevice)'
# In case `mount UUID=` and similar also works
diff --git a/share/functions/__fish_complete_blockdevice.fish b/share/functions/__fish_complete_blockdevice.fish
new file mode 100644
index 00000000..d07487de
--- /dev/null
+++ b/share/functions/__fish_complete_blockdevice.fish
@@ -0,0 +1,12 @@
+# Helper function for completions that need to enumerate block devices.
+function __fish_complete_blockdevice
+ set -l cmd (commandline -ct)
+ test "" = "$cmd"
+ and return
+ for f in $cmd*
+ test -b $f
+ and printf "%s\t%s\n" $f "Block device"
+ test -d $f
+ and printf "%s\n" $f/
+ end
+end