From 013001c28394fe81723942487c0714bca79b48d8 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Dec 2019 19:07:42 +0900 Subject: [PATCH] Move __fish_print_lsblk_columns into lsblk completion script --- share/completions/lsblk.fish | 6 +++++- share/functions/__fish_print_lsblk_columns.fish | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 share/functions/__fish_print_lsblk_columns.fish diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish index e287871a9..35ca6c04a 100644 --- a/share/completions/lsblk.fish +++ b/share/completions/lsblk.fish @@ -1,3 +1,8 @@ +function __fish_print_lsblk_columns --description 'Print available lsblk columns' + lsblk --help | sed '1,/Available columns:/d; /^$/,$d; s/^\s\+//; s/\s/\t/' + +end + complete -c lsblk -s a -l all -d "print all devices" complete -c lsblk -s b -l bytes -d "print SIZE in bytes rather than in human readable format" complete -c lsblk -s d -l nodeps -d "don't print slaves or holders" @@ -13,4 +18,3 @@ complete -c lsblk -s P -l pairs -d "use key='value' output format" complete -c lsblk -s r -l raw -d "use raw output format" complete -c lsblk -s t -l topology -d "output info about topology" complete -c lsblk -s l -l list -d "use list format output" - diff --git a/share/functions/__fish_print_lsblk_columns.fish b/share/functions/__fish_print_lsblk_columns.fish deleted file mode 100644 index a9c75a3d2..000000000 --- a/share/functions/__fish_print_lsblk_columns.fish +++ /dev/null @@ -1,4 +0,0 @@ -function __fish_print_lsblk_columns --description 'Print available lsblk columns' - lsblk --help | sed '1,/Available columns:/d; /^$/,$d; s/^\s\+//; s/\s/\t/' - -end