From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH 1/3] new: clean up the group name input code
Date: Thu, 16 Sep 2021 17:39:55 -0700 [thread overview]
Message-ID: <163183919544.953189.7870290547648551530.stgit@magnolia> (raw)
In-Reply-To: <163183918998.953189.9876855385681643134.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Clean up the code that reads group names in from the command line to
take advantage of the read command's ability to display a prompt. While
we're at it, we should abort the script if the group list encounters
EOF, and we can tighten up some of the other sh-isms too.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
new | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/new b/new
index 6b7dc5d4..ea7cf25e 100755
--- a/new
+++ b/new
@@ -91,16 +91,13 @@ group_names() {
}' doc/group-names.txt
}
-if [ $# -eq 0 ]
-then
-
+if [ $# -eq 0 ]; then
+ prompt="Add to group(s) [other] (separate by space, ? for list): "
while true
do
- echo -n "Add to group(s) [other] (separate by space, ? for list): "
- read ans
- [ -z "$ans" ] && ans=other
- if [ "X$ans" = "X?" ]
- then
+ read -p "${prompt}" ans || exit 1
+ test -z "${ans}" && ans=other
+ if [ "${ans}" = "?" ]; then
echo $(group_names)
else
# only allow lower cases, spaces, digits and underscore in group
next prev parent reply other threads:[~2021-09-17 0:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-17 0:39 [PATCHSET 0/3] fstests: various cleanups to ./new script Darrick J. Wong
2021-09-17 0:39 ` Darrick J. Wong [this message]
2021-09-17 10:28 ` [PATCH 1/3] new: clean up the group name input code Amir Goldstein
2021-09-17 0:40 ` [PATCH 2/3] new: standardize group name checking Darrick J. Wong
2021-09-17 10:32 ` Amir Goldstein
2021-09-17 0:40 ` [PATCH 3/3] new: don't allow new tests in group 'other' Darrick J. Wong
2021-09-17 10:42 ` Amir Goldstein
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=163183919544.953189.7870290547648551530.stgit@magnolia \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@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).