From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 1/2] btrfs-progs: completion: Use _filedir() to replace _btrfs_devs()
Date: Mon, 13 Aug 2018 14:02:43 +0800 [thread overview]
Message-ID: <20180813060244.8795-2-wqu@suse.com> (raw)
In-Reply-To: <20180813060244.8795-1-wqu@suse.com>
For developers it's pretty common to call "btrfs check" on a raw image
dump other than real block device.
It's also possible to end users to do some tests on loop devices.
So current _btrfs_devs() is really making things worse. Use _filedir()
to replace _btrfs_devs() so it can complete any filenames, no matter if
it's just a file or a real block device.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
btrfs-completion | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/btrfs-completion b/btrfs-completion
index ae683f4ecf61..b7628e6984c5 100644
--- a/btrfs-completion
+++ b/btrfs-completion
@@ -4,13 +4,6 @@
# (http://lists.alioth.debian.org/pipermail/bash-completion-devel/2013-June/004868.html)
# edited by John C F <john.ch.fr at gmail.com> on 2015-02-02
-_btrfs_devs()
-{
- local DEVS
- DEVS=''; while read dev; do DEVS+="$dev "; done < <(lsblk -pnro name)
- COMPREPLY+=( $( compgen -W "$DEVS" -- "$cur" ) )
-}
-
_btrfs_mnts()
{
local MNTS
@@ -68,14 +61,14 @@ _btrfs()
opts="$commands_scrub"
;;
check)
- _btrfs_devs
+ _filedir
return 0
;;
rescue)
opts="$commands_rescue"
;;
restore)
- _btrfs_devs
+ _filedir
return 0
;;
inspect-internal)
@@ -120,13 +113,13 @@ _btrfs()
;;
label)
_btrfs_mnts
- _btrfs_devs
+ _filedir
return 0
;;
esac
;;
device|rescue)
- _btrfs_devs
+ _filedir
return 0
;;
inspect-internal)
@@ -156,7 +149,7 @@ _btrfs()
return 0
;;
start)
- _btrfs_devs
+ _filedir
return 0
;;
esac
--
2.18.0
next prev parent reply other threads:[~2018-08-13 8:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 6:02 [PATCH v2 0/2] btrfs-progs: completion: Small fixes to make debug simpler Qu Wenruo
2018-08-13 6:02 ` Qu Wenruo [this message]
2018-08-13 6:02 ` [PATCH v2 2/2] btrfs-progs: completion: Let dump-tree/dump-super/inode-resolve to accept any file Qu Wenruo
2018-08-20 13:40 ` [PATCH v2 0/2] btrfs-progs: completion: Small fixes to make debug simpler David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180813060244.8795-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).